Wrap with expiring holders.

Author: dkocher

hub/src/main/java/cloud/katta/protocols/hub/HubSession.java

@@ -87,11 +87,14 @@ public class HubSession extends HttpSession<HubApiClient> {
      */
     private OAuth2RequestInterceptor authorizationService;
 
-    private UserDto me;
-    private ConfigDto config;
+    private final ExpiringObjectHolder<UserDto> userDtoHolder
+            = new ExpiringObjectHolder<>(-1L == preferences.getLong("katta.user.ttl") ? Long.MAX_VALUE : preferences.getLong("katta.user.ttl"));
 
-    private final ExpiringObjectHolder<UserKeys> userKeys
-            = new ExpiringObjectHolder<>(preferences.getLong("katta.userkeys.ttl"));
+    private final ExpiringObjectHolder<ConfigDto> configDtoHolder
+            = new ExpiringObjectHolder<>(-1L == preferences.getLong("katta.config.ttl") ? Long.MAX_VALUE : preferences.getLong("katta.config.ttl"));
+
+    private final ExpiringObjectHolder<UserKeys> userKeysHolder
+            = new ExpiringObjectHolder<>(-1L == preferences.getLong("katta.userkeys.ttl") ? Long.MAX_VALUE : preferences.getLong("katta.userkeys.ttl"));
 
     private HubVaultListService vaults;
 
@@ -113,7 +116,7 @@ protected HubApiClient connect(final ProxyFinder proxy, final HostKeyCallback ke
             final HubApiClient client = new HubApiClient(host, configuration.build());
             try {
                 // Obtain OAuth configuration
-                config = new ConfigResourceApi(client).apiConfigGet();
+                final ConfigDto config = this.getConfig();
                 final int minHubApiLevel = HostPreferencesFactory.get(host).getInteger("cloud.katta.min_api_level");
                 final Integer apiLevel = config.getApiLevel();
                 if(apiLevel == null || apiLevel < minHubApiLevel) {
@@ -129,9 +132,6 @@ protected HubApiClient connect(final ProxyFinder proxy, final HostKeyCallback ke
                 log.debug("Apply profile {} to bookmark {}", profile, host);
                 host.setProtocol(profile);
             }
-            catch(ApiException e) {
-                throw new HubExceptionMappingService().map(e);
-            }
             finally {
                 client.getHttpClient().close();
             }
@@ -164,12 +164,14 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
             throw new LoginCanceledException(e);
         }
         try {
-            me = new UsersResourceApi(client).apiUsersMeGet(true, false);
+            final UserDto me = this.getMe();
             log.debug("Retrieved user {}", me);
             // Ensure device key is available
             final DeviceSetupCallback setup = prompt.getFeature(DeviceSetupCallback.class);
             log.debug("Configured with setup prompt {}", setup);
-            userKeys.set(this.pair(setup));
+            final UserKeys userKeys = this.getUserKeys(setup);
+            log.debug("Retrieved user keys {}", userKeys);
+            final ConfigDto config = this.getConfig();
             final List<StorageProfileDto> storageProfileDtos = new StorageProfileResourceApi(client).apiStorageprofileGet(false);
             for(StorageProfileDto storageProfileDto : storageProfileDtos) {
                 final StorageProfileDtoWrapper storageProfile = StorageProfileDtoWrapper.coerce(storageProfileDto);
@@ -198,7 +200,8 @@ private UserKeys pair(final DeviceSetupCallback setup) throws BackgroundExceptio
         try {
             final DeviceKeys deviceKeys = new DeviceKeysServiceImpl(keychain).getOrCreateDeviceKeys(host, setup);
             log.debug("Retrieved device keys {}", deviceKeys);
-            final UserKeys userKeys = new UserKeysServiceImpl(this, keychain).getOrCreateUserKeys(host, me, deviceKeys, setup);
+            final UserKeys userKeys = new UserKeysServiceImpl(this, keychain).getOrCreateUserKeys(host,
+                    this.getMe(), deviceKeys, setup);
             log.debug("Retrieved user keys {}", userKeys);
             return userKeys;
         }
@@ -224,19 +227,39 @@ protected void logout() {
      *
      * @return Null prior login
      */
-    public UserDto getMe() {
-        return me;
+    public UserDto getMe() throws BackgroundException {
+        try {
+            if(userDtoHolder.get() == null) {
+                userDtoHolder.set(new UsersResourceApi(client).apiUsersMeGet(true, false));
+            }
+            return userDtoHolder.get();
+        }
+        catch(ApiException e) {
+            throw new HubExceptionMappingService().map(e);
+        }
+    }
+
+    public ConfigDto getConfig() throws BackgroundException {
+        try {
+            if(configDtoHolder.get() == null) {
+                configDtoHolder.set(new ConfigResourceApi(client).apiConfigGet());
+            }
+            return configDtoHolder.get();
+        }
+        catch(ApiException e) {
+            throw new HubExceptionMappingService().map(e);
+        }
     }
 
     /**
      *
      * @return Destroyed keys after login
      */
     public UserKeys getUserKeys(final DeviceSetupCallback setup) throws BackgroundException {
-        if(userKeys.get() == null) {
-            userKeys.set(this.pair(setup));
+        if(userKeysHolder.get() == null) {
+            userKeysHolder.set(this.pair(setup));
         }
-        return userKeys.get();
+        return userKeysHolder.get();
     }
 
     @Override