dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21377
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-12-08 20:36:21 +0100
message:
  Added enum UserSettingKey
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java	2015-12-08 19:36:21 +0000
@@ -0,0 +1,152 @@
+package org.hisp.dhis.user;
+
+/*
+ * Copyright (c) 2004-2015, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.io.Serializable;
+import java.util.Locale;
+import java.util.Optional;
+
+import org.hisp.dhis.setting.SettingKey;
+
+/**
+ * @author Lars Helge Overland
+ */
+public enum UserSettingKey
+{
+    STYLE( "stylesheet" ),
+    STYLE_DIRECTORY( "stylesheetDirectory" ),
+    MESSAGE_EMAIL_NOTIFICATION( "keyMessageEmailNotification", Boolean.FALSE, Boolean.class ),
+    MESSAGE_SMS_NOTIFICATION( "keyMessageSmsNotification", Boolean.FALSE, Boolean.class ),
+    UI_LOCALE( "keyUiLocale", Locale.class ),
+    DB_LOCALE( "keyDbLocale", Locale.class ),
+    ANALYSIS_DISPLAY_PROPERTY( "keyAnalysisDisplayProperty", "name", String.class ),
+    KEY_CURRENT_DOMAIN_TYPE( "currentDomainType" ),
+    AUTO_SAVE_CASE_ENTRY_FORM( "autoSaveCaseEntryForm", Boolean.FALSE, Boolean.class ),
+    AUTO_SAVE_TRACKED_ENTITY_REGISTRATION_ENTRY_FORM( "autoSavetTrackedEntityForm", Boolean.FALSE, Boolean.class ),
+    AUTO_SAVE_DATA_ENTRY_FORM( "autoSaveDataEntryForm", Boolean.FALSE, Boolean.class );    
+    
+    private final String name;
+    
+    private final Serializable defaultValue;
+    
+    private final Class<?> clazz;
+
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
+    private UserSettingKey( String name )
+    {
+        this.name = name;
+        this.defaultValue = null;
+        this.clazz = String.class;
+    }
+    
+    private UserSettingKey( String name, Class<?> clazz )
+    {
+        this.name = name;
+        this.defaultValue = null;
+        this.clazz = clazz;
+    }
+    
+    private UserSettingKey( String name, Serializable defaultValue, Class<?> clazz )
+    {
+        this.name = name;
+        this.defaultValue = defaultValue;
+        this.clazz = clazz;
+    }
+
+    // -------------------------------------------------------------------------
+    // Logic
+    // -------------------------------------------------------------------------
+
+    public static Optional<SettingKey> getByName( String name )
+    {
+        for ( SettingKey setting : SettingKey.values() )
+        {
+            if ( setting.getName().equals( name ) )
+            {
+                return Optional.of( setting );
+            }
+        }
+        
+        return Optional.empty();
+    }
+
+    public static Serializable getAsRealClass( String name, String value )
+    {
+        Optional<SettingKey> setting = getByName( name );
+                
+        if ( setting.isPresent() )
+        {            
+            Class<?> settingClazz = setting.get().getClazz();
+            
+            if ( Double.class.isAssignableFrom( settingClazz ) )
+            {
+                return Double.valueOf( value );
+            }
+            else if ( Integer.class.isAssignableFrom( settingClazz ) )
+            {
+                return Integer.valueOf( value );
+            }
+            else if ( Boolean.class.isAssignableFrom( settingClazz ) )
+            {
+                return Boolean.valueOf( value );
+            }
+            
+            //TODO handle Dates
+        }
+        
+        return value;
+    }
+    
+    public boolean hasDefaultValue()
+    {
+        return defaultValue != null;
+    }
+
+    // -------------------------------------------------------------------------
+    // Getters
+    // -------------------------------------------------------------------------
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public Serializable getDefaultValue()
+    {
+        return defaultValue;
+    }
+
+    public Class<?> getClazz()
+    {
+        return clazz;
+    }
+}

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java	2015-10-14 17:36:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java	2015-12-08 19:36:21 +0000
@@ -52,7 +52,7 @@
      * Cache for user settings. Does not accept nulls. Key is "name-username".
      */
     private static Cache<String, Optional<Serializable>> SETTING_CACHE = CacheBuilder.newBuilder()
-        .expireAfterAccess( 15, TimeUnit.MINUTES )
+        .expireAfterAccess( 1, TimeUnit.HOURS )
         .initialCapacity( 200 )
         .maximumSize( 10000 )
         .build();
@@ -117,7 +117,7 @@
         
         saveUserSetting( name, value, currentUser );
     }
-
+    
     @Override
     public void saveUserSetting( String name, Serializable value, User user )
     {