Renamed Classes: Corrected imports by renaming class files to fit cor…

…rect name used when referenced

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/cmsencryption/DefaultCMSEncryptionModule.java

@@ -6,7 +6,7 @@
 import de.adorsys.datasafe.encrypiton.api.cmsencryption.CMSEncryptionService;
 import de.adorsys.datasafe.encrypiton.api.types.encryption.CmsEncryptionConfig;
 import de.adorsys.datasafe.encrypiton.api.types.encryption.EncryptionConfig;
-import de.adorsys.datasafe.encrypiton.impl.cmsencryption.CMSEncryptionServiceImplRuntimeDelegatable;
+import de.adorsys.datasafe.encrypiton.impl.cmsencryption.CMSEncryptionServiceImpl;
 
 import javax.annotation.Nullable;
 
@@ -32,5 +32,5 @@ static CmsEncryptionConfig cmsEncryptionConfig(@Nullable EncryptionConfig config
  * Default BouncyCastle based CMS encryption for document.
  */
  @Binds
- abstract CMSEncryptionService cmsEncryptionService(CMSEncryptionServiceImplRuntimeDelegatable impl);
+ abstract CMSEncryptionService cmsEncryptionService(CMSEncryptionServiceImpl impl);
 }

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/directory/DefaultCredentialsModule.java

@@ -7,11 +7,11 @@
 import de.adorsys.datasafe.directory.api.profile.keys.PrivateKeyService;
 import de.adorsys.datasafe.directory.api.profile.keys.PublicKeyService;
 import de.adorsys.datasafe.directory.api.profile.keys.StorageKeyStoreOperations;
-import de.adorsys.datasafe.directory.impl.profile.dfs.BucketAccessServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.keys.DFSPrivateKeyServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.keys.DFSPublicKeyServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.keys.DocumentKeyStoreOperationsImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.keys.StorageKeyStoreOperationsImplRuntimeDelegatable;
+import de.adorsys.datasafe.directory.impl.profile.dfs.BucketAccessServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.keys.DFSPrivateKeyServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.keys.DFSPublicKeyServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.keys.DocumentKeyStoreOperationsImpl;
+import de.adorsys.datasafe.directory.impl.profile.keys.StorageKeyStoreOperationsImpl;
 
 /**
  * This module is responsible for credentials access - either user or dfs.
@@ -23,30 +23,30 @@ public abstract class DefaultCredentialsModule {
  * Default no-op service to get credentials to access filesystem.
  */
  @Binds
- abstract BucketAccessService bucketAccessService(BucketAccessServiceImplRuntimeDelegatable impl);
+ abstract BucketAccessService bucketAccessService(BucketAccessServiceImpl impl);
 
  /**
  * Default public key service that reads user public keys from the location specified by his profile inside DFS.
  */
  @Binds
- abstract PublicKeyService publicKeyService(DFSPublicKeyServiceImplRuntimeDelegatable impl);
+ abstract PublicKeyService publicKeyService(DFSPublicKeyServiceImpl impl);
 
  /**
  * Keystore(document) operations class that hides keystore access from other components.
  */
  @Binds
- abstract DocumentKeyStoreOperations docKeyStoreOperations(DocumentKeyStoreOperationsImplRuntimeDelegatable impl);
+ abstract DocumentKeyStoreOperations docKeyStoreOperations(DocumentKeyStoreOperationsImpl impl);
 
  /**
  * Keystore(storage credentials) operations class that hides keystore access from other components.
  */
  @Binds
- abstract StorageKeyStoreOperations storageKeyStoreOperations(StorageKeyStoreOperationsImplRuntimeDelegatable impl);
+ abstract StorageKeyStoreOperations storageKeyStoreOperations(StorageKeyStoreOperationsImpl impl);
 
  /**
  * Default private key service that reads user private/secret keys from the location specified by his
  * profile inside DFS.
  */
  @Binds
- abstract PrivateKeyService privateKeyService(DFSPrivateKeyServiceImplRuntimeDelegatable impl);
+ abstract PrivateKeyService privateKeyService(DFSPrivateKeyServiceImpl impl);
 }

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/directory/DefaultKeystoreCacheModule.java

@@ -4,7 +4,7 @@
 import com.google.common.cache.CacheBuilder;
 import dagger.Module;
 import dagger.Provides;
-import de.adorsys.datasafe.directory.impl.profile.keys.DefaultKeyStoreCacheRuntimeDelegatable;
+import de.adorsys.datasafe.directory.impl.profile.keys.DefaultKeyStoreCache;
 import de.adorsys.datasafe.directory.impl.profile.keys.KeyStoreCache;
 import de.adorsys.datasafe.encrypiton.api.types.UserID;
 import de.adorsys.datasafe.encrypiton.api.types.keystore.PublicKeyIDWithPublicKey;
@@ -42,7 +42,7 @@ static KeyStoreCache keyStoreCache(@Nullable OverridesRegistry registry) {
  .expireAfterWrite(60, TimeUnit.MINUTES)
  .build();
 
- return new DefaultKeyStoreCacheRuntimeDelegatable(
+ return new DefaultKeyStoreCache(
  registry,
  cachePubKeys.get().asMap(),
  cacheKeystore.get().asMap(),

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/directory/DefaultProfileModule.java

@@ -14,15 +14,15 @@
 import de.adorsys.datasafe.directory.api.resource.ResourceResolver;
 import de.adorsys.datasafe.directory.api.types.UserPrivateProfile;
 import de.adorsys.datasafe.directory.api.types.UserPublicProfile;
-import de.adorsys.datasafe.directory.impl.profile.operations.DFSBasedProfileStorageImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.operations.DefaultUserProfileCacheRuntimeDelegatable;
+import de.adorsys.datasafe.directory.impl.profile.operations.DFSBasedProfileStorageImpl;
+import de.adorsys.datasafe.directory.impl.profile.operations.DefaultUserProfileCache;
 import de.adorsys.datasafe.directory.impl.profile.operations.UserProfileCache;
-import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileRegistrationServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileRemovalServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileRetrievalServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileStorageCredentialsServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileUpdatingServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.directory.impl.profile.resource.ResourceResolverImplRuntimeDelegatable;
+import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileRegistrationServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileRemovalServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileRetrievalServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileStorageCredentialsServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.operations.actions.ProfileUpdatingServiceImpl;
+import de.adorsys.datasafe.directory.impl.profile.resource.ResourceResolverImpl;
 import de.adorsys.datasafe.encrypiton.api.types.UserID;
 import de.adorsys.datasafe.encrypiton.api.types.encryption.EncryptionConfig;
 import de.adorsys.datasafe.encrypiton.api.types.encryption.KeyCreationConfig;
@@ -63,7 +63,7 @@ static UserProfileCache userProfileCache(@Nullable OverridesRegistry registry) {
  .expireAfterWrite(15, TimeUnit.MINUTES)
  .build();
 
- return new DefaultUserProfileCacheRuntimeDelegatable(
+ return new DefaultUserProfileCache(
  registry,
  publicProfileCache.asMap(),
  privateProfileCache.asMap()
@@ -74,41 +74,41 @@ static UserProfileCache userProfileCache(@Nullable OverridesRegistry registry) {
  * Default profile reading service that simply reads json files with serialized public/private located on DFS.
  */
  @Binds
- abstract ProfileRetrievalService profileRetrievalService(ProfileRetrievalServiceImplRuntimeDelegatable impl);
+ abstract ProfileRetrievalService profileRetrievalService(ProfileRetrievalServiceImpl impl);
 
  /**
  * Default profile creation service that simply creates keystore, public keys, user profile json files on DFS.
  */
  @Binds
- abstract ProfileRegistrationService creationService(ProfileRegistrationServiceImplRuntimeDelegatable impl);
+ abstract ProfileRegistrationService creationService(ProfileRegistrationServiceImpl impl);
 
  /**
  * Default profile updating service.
  */
  @Binds
- abstract ProfileUpdatingService updatingService(ProfileUpdatingServiceImplRuntimeDelegatable impl);
+ abstract ProfileUpdatingService updatingService(ProfileUpdatingServiceImpl impl);
 
  /**
  * Default profile removal service.
  */
  @Binds
- abstract ProfileRemovalService removalService(ProfileRemovalServiceImplRuntimeDelegatable impl);
+ abstract ProfileRemovalService removalService(ProfileRemovalServiceImpl impl);
 
  /**
  * Storage credentials access.
  */
  @Binds
- abstract ProfileStorageCredentialsService profileStorageCredentialsService(ProfileStorageCredentialsServiceImplRuntimeDelegatable impl);
+ abstract ProfileStorageCredentialsService profileStorageCredentialsService(ProfileStorageCredentialsServiceImpl impl);
 
  /**
  * Resource resolver that simply prepends relevant path segment from profile based on location type.
  */
  @Binds
- abstract ResourceResolver resourceResolver(ResourceResolverImplRuntimeDelegatable impl);
+ abstract ResourceResolver resourceResolver(ResourceResolverImpl impl);
 
  /**
  * Aggregate service for profile operations.
  */
  @Binds
- abstract ProfileOperations profileService(DFSBasedProfileStorageImplRuntimeDelegatable impl);
+ abstract ProfileOperations profileService(DFSBasedProfileStorageImpl impl);
 }

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/document/DefaultDocumentModule.java

@@ -4,8 +4,8 @@
 import dagger.Module;
 import de.adorsys.datasafe.encrypiton.api.document.EncryptedDocumentReadService;
 import de.adorsys.datasafe.encrypiton.api.document.EncryptedDocumentWriteService;
-import de.adorsys.datasafe.encrypiton.impl.document.CMSDocumentReadServiceRuntimeDelegatable;
-import de.adorsys.datasafe.encrypiton.impl.document.CMSDocumentWriteServiceRuntimeDelegatable;
+import de.adorsys.datasafe.encrypiton.impl.document.CMSDocumentReadService;
+import de.adorsys.datasafe.encrypiton.impl.document.CMSDocumentWriteService;
 
 /**
  * This module is responsible for document storage (example: which pathencryption to use) and listing bucket content.
@@ -17,11 +17,11 @@ public abstract class DefaultDocumentModule {
  * By default, encrypt document using CMS-encryption provided by BouncyCastle.
  */
  @Binds
- abstract EncryptedDocumentReadService documentReadService(CMSDocumentReadServiceRuntimeDelegatable impl);
+ abstract EncryptedDocumentReadService documentReadService(CMSDocumentReadService impl);
 
  /**
  * By default, decrypt document using CMS-encryption provided by BouncyCastle.
  */
  @Binds
- abstract EncryptedDocumentWriteService documentWriteService(CMSDocumentWriteServiceRuntimeDelegatable impl);
+ abstract EncryptedDocumentWriteService documentWriteService(CMSDocumentWriteService impl);
 }

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/inbox/actions/DefaultInboxActionsModule.java

@@ -7,11 +7,11 @@
 import de.adorsys.datasafe.inbox.api.actions.ReadFromInbox;
 import de.adorsys.datasafe.inbox.api.actions.RemoveFromInbox;
 import de.adorsys.datasafe.inbox.api.actions.WriteToInbox;
-import de.adorsys.datasafe.inbox.impl.InboxServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.inbox.impl.actions.ListInboxImplRuntimeDelegatable;
-import de.adorsys.datasafe.inbox.impl.actions.ReadFromInboxImplRuntimeDelegatable;
-import de.adorsys.datasafe.inbox.impl.actions.RemoveFromInboxImplRuntimeDelegatable;
-import de.adorsys.datasafe.inbox.impl.actions.WriteToInboxImplRuntimeDelegatable;
+import de.adorsys.datasafe.inbox.impl.InboxServiceImpl;
+import de.adorsys.datasafe.inbox.impl.actions.ListInboxImpl;
+import de.adorsys.datasafe.inbox.impl.actions.ReadFromInboxImpl;
+import de.adorsys.datasafe.inbox.impl.actions.RemoveFromInboxImpl;
+import de.adorsys.datasafe.inbox.impl.actions.WriteToInboxImpl;
 
 /**
  * This module is responsible for providing default actions on INBOX folder. Paths are not encrypted in INBOX.
@@ -23,30 +23,30 @@ public abstract class DefaultInboxActionsModule {
  * By default, lists files in users' INBOX location on DFS (privatespace access required).
  */
  @Binds
- abstract ListInbox listInbox(ListInboxImplRuntimeDelegatable impl);
+ abstract ListInbox listInbox(ListInboxImpl impl);
 
  /**
  * By default, reads and decrypts file (using private key) from users' INBOX location on DFS
  * (privatespace access required).
  */
  @Binds
- abstract ReadFromInbox readInbox(ReadFromInboxImplRuntimeDelegatable impl);
+ abstract ReadFromInbox readInbox(ReadFromInboxImpl impl);
 
  /**
  * By default, writes file into users' INBOX using his public key (no privatespace access required).
  */
  @Binds
- abstract WriteToInbox writeInbox(WriteToInboxImplRuntimeDelegatable impl);
+ abstract WriteToInbox writeInbox(WriteToInboxImpl impl);
 
  /**
  * By default, deletes file from users' INBOX location on DFS (privatespace access required).
  */
  @Binds
- abstract RemoveFromInbox removeFromInbox(RemoveFromInboxImplRuntimeDelegatable impl);
+ abstract RemoveFromInbox removeFromInbox(RemoveFromInboxImpl impl);
 
  /**
  * Aggregate view of operations that can be done on INBOX.
  */
  @Binds
- abstract InboxService inboxService(InboxServiceImplRuntimeDelegatable impl);
+ abstract InboxService inboxService(InboxServiceImpl impl);
 }

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/keystore/DefaultKeyStoreModule.java

@@ -6,8 +6,8 @@
 import de.adorsys.datasafe.encrypiton.api.keystore.KeyStoreService;
 import de.adorsys.datasafe.encrypiton.api.keystore.PublicKeySerde;
 import de.adorsys.datasafe.encrypiton.api.types.encryption.EncryptionConfig;
-import de.adorsys.datasafe.encrypiton.impl.keystore.KeyStoreServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.encrypiton.impl.keystore.PublicKeySerdeImplRuntimeDelegatable;
+import de.adorsys.datasafe.encrypiton.impl.keystore.KeyStoreServiceImpl;
+import de.adorsys.datasafe.encrypiton.impl.keystore.PublicKeySerdeImpl;
 import de.adorsys.keymanagement.api.Juggler;
 import de.adorsys.keymanagement.api.config.keystore.KeyStoreConfig;
 import de.adorsys.keymanagement.juggler.services.DaggerBCJuggler;
@@ -44,12 +44,12 @@ static Juggler juggler(KeyStoreConfig config) {
  * Default public key serializer.
  */
  @Binds
- public abstract PublicKeySerde publicKeySerde(PublicKeySerdeImplRuntimeDelegatable impl);
+ public abstract PublicKeySerde publicKeySerde(PublicKeySerdeImpl impl);
 
  /**
  * If no external configuration provided ({@link KeyStoreConfig}), BouncyCastle BCFKS key store type is
  * used by default.
  */
  @Binds
- public abstract KeyStoreService keyStoreService(KeyStoreServiceImplRuntimeDelegatable impl);
+ public abstract KeyStoreService keyStoreService(KeyStoreServiceImpl impl);
 }

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/pathencryption/DefaultPathEncryptionModule.java

@@ -5,10 +5,10 @@
 import dagger.Provides;
 import de.adorsys.datasafe.encrypiton.api.pathencryption.PathEncryption;
 import de.adorsys.datasafe.encrypiton.api.pathencryption.encryption.SymmetricPathEncryptionService;
-import de.adorsys.datasafe.encrypiton.impl.pathencryption.IntegrityPreservingUriEncryptionRuntimeDelegatable;
-import de.adorsys.datasafe.encrypiton.impl.pathencryption.PathEncryptionImplRuntimeDelegatable;
+import de.adorsys.datasafe.encrypiton.impl.pathencryption.IntegrityPreservingUriEncryption;
+import de.adorsys.datasafe.encrypiton.impl.pathencryption.PathEncryptionImpl;
 import de.adorsys.datasafe.encrypiton.impl.pathencryption.PathEncryptorDecryptor;
-import de.adorsys.datasafe.encrypiton.impl.pathencryption.PathSegmentEncryptorDecryptorRuntimeDelegatable;
+import de.adorsys.datasafe.encrypiton.impl.pathencryption.PathSegmentEncryptorDecryptor;
 import org.cryptomator.siv.SivMode;
 
 /**
@@ -30,19 +30,19 @@ static SivMode sivMode() {
  * Default path encryption that uses Base64-urlsafe path serialization and AES-CGM-SIV mode for encryption
  */
  @Binds
- abstract PathEncryptorDecryptor pathEncryptorDecryptor(PathSegmentEncryptorDecryptorRuntimeDelegatable impl);
+ abstract PathEncryptorDecryptor pathEncryptorDecryptor(PathSegmentEncryptorDecryptor impl);
 
  /**
  * By default simply use
  * {@link de.adorsys.datasafe.directory.api.profile.keys.PrivateKeyService} to get key
  * and pass path with key to {@link SymmetricPathEncryptionService}
  */
  @Binds
- abstract PathEncryption pathEncryption(PathEncryptionImplRuntimeDelegatable impl);
+ abstract PathEncryption pathEncryption(PathEncryptionImpl impl);
 
  /**
  * Default symmetric path encryption that encrypts URI segment-by-segment.
  */
  @Binds
- abstract SymmetricPathEncryptionService symmetricPathEncryptionService(IntegrityPreservingUriEncryptionRuntimeDelegatable impl);
+ abstract SymmetricPathEncryptionService symmetricPathEncryptionService(IntegrityPreservingUriEncryption impl);
 }

datasafe-business/src/main/java/de/adorsys/datasafe/business/impl/privatestore/actions/DefaultPrivateActionsModule.java

@@ -8,12 +8,12 @@
 import de.adorsys.datasafe.privatestore.api.actions.ReadFromPrivate;
 import de.adorsys.datasafe.privatestore.api.actions.RemoveFromPrivate;
 import de.adorsys.datasafe.privatestore.api.actions.WriteToPrivate;
-import de.adorsys.datasafe.privatestore.impl.PrivateSpaceServiceImplRuntimeDelegatable;
-import de.adorsys.datasafe.privatestore.impl.actions.EncryptedResourceResolverImplRuntimeDelegatable;
-import de.adorsys.datasafe.privatestore.impl.actions.ListPrivateImplRuntimeDelegatable;
-import de.adorsys.datasafe.privatestore.impl.actions.ReadFromPrivateImplRuntimeDelegatable;
-import de.adorsys.datasafe.privatestore.impl.actions.RemoveFromPrivateImplRuntimeDelegatable;
-import de.adorsys.datasafe.privatestore.impl.actions.WriteToPrivateImplRuntimeDelegatable;
+import de.adorsys.datasafe.privatestore.impl.PrivateSpaceServiceImpl;
+import de.adorsys.datasafe.privatestore.impl.actions.EncryptedResourceResolverImpl;
+import de.adorsys.datasafe.privatestore.impl.actions.ListPrivateImpl;
+import de.adorsys.datasafe.privatestore.impl.actions.ReadFromPrivateImpl;
+import de.adorsys.datasafe.privatestore.impl.actions.RemoveFromPrivateImpl;
+import de.adorsys.datasafe.privatestore.impl.actions.WriteToPrivateImpl;
 
 /**
  * This module is responsible for providing default actions on PRIVATE folder.
@@ -25,36 +25,36 @@ public abstract class DefaultPrivateActionsModule {
  * By default encrypts URI of the document and resolves its absolute location against PRIVATE folder.
  */
  @Binds
- abstract EncryptedResourceResolver encryptedResourceResolver(EncryptedResourceResolverImplRuntimeDelegatable impl);
+ abstract EncryptedResourceResolver encryptedResourceResolver(EncryptedResourceResolverImpl impl);
 
  /**
  * Lists files in PRIVATE folder, also provides decrypted path of the document.
  */
  @Binds
- abstract ListPrivate listPrivate(ListPrivateImplRuntimeDelegatable impl);
+ abstract ListPrivate listPrivate(ListPrivateImpl impl);
 
  /**
  * Reads and decrypts file from private folder using secret key.
  */
  @Binds
- abstract ReadFromPrivate readFromPrivate(ReadFromPrivateImplRuntimeDelegatable impl);
+ abstract ReadFromPrivate readFromPrivate(ReadFromPrivateImpl impl);
 
  /**
  * Writes and encrypts file to private folder using secret key (also document URI is encrypted using
  * {@link EncryptedResourceResolver}).
  */
  @Binds
- abstract WriteToPrivate writeToPrivate(WriteToPrivateImplRuntimeDelegatable impl);
+ abstract WriteToPrivate writeToPrivate(WriteToPrivateImpl impl);
 
  /**
  * Removes file from user private storage.
  */
  @Binds
- abstract RemoveFromPrivate removeFromPrivate(RemoveFromPrivateImplRuntimeDelegatable impl);
+ abstract RemoveFromPrivate removeFromPrivate(RemoveFromPrivateImpl impl);
 
  /**
  * Aggregate view of operations that can be done on privatespace.
  */
  @Binds
- abstract PrivateSpaceService privateSpaceService(PrivateSpaceServiceImplRuntimeDelegatable impl);
+ abstract PrivateSpaceService privateSpaceService(PrivateSpaceServiceImpl impl);
 }