eventuate-clients#9: Enhancing the Eventuate Java Client According GD…

…PR. Fixing decription.
dartartem · Apr 17, 2018 · 21b373c · 21b373c
1 parent 5701aa7
commit 21b373c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...on-impl/src/main/java/io/eventuate/javaclient/commonimpl/EventuateAggregateStoreImpl.java b/...on-impl/src/main/java/io/eventuate/javaclient/commonimpl/EventuateAggregateStoreImpl.java
@@ -124,7 +124,7 @@ public <T extends Aggregate<T>> CompletableFuture<EntityWithMetadata<T>> find(Cl
               .map(event ->
                       AggregateCrudMapping.toEventWithMetadata(event, json -> findOptions
                               .flatMap(FindOptions::getEncryptionKey)
-                              .map(k -> eventDataEncryptor.decrypt(k, json))
+                              .map(k -> EncryptedEventData.isEventDataStringEncrypted(json) ? eventDataEncryptor.decrypt(k, json) : json)
                               .orElse(json)))
               .collect(Collectors.toList());
 

diff --git a/...pl/src/main/java/io/eventuate/javaclient/commonimpl/sync/EventuateAggregateStoreImpl.java b/...pl/src/main/java/io/eventuate/javaclient/commonimpl/sync/EventuateAggregateStoreImpl.java
@@ -109,7 +109,7 @@ public <T extends Aggregate<T>> EntityWithMetadata<T> find(Class<T> clasz, Strin
               .map(event ->
                       AggregateCrudMapping.toEventWithMetadata(event, json -> findOptions
                               .flatMap(FindOptions::getEncryptionKey)
-                              .map(k -> eventDataEncryptor.decrypt(k, json))
+                              .map(k -> EncryptedEventData.isEventDataStringEncrypted(json) ? eventDataEncryptor.decrypt(k, json) : json)
                               .orElse(json)))
               .collect(Collectors.toList());
       List<Event> events = eventsWithIds.stream().map(EventWithMetadata::getEvent).collect(Collectors.toList());