ng-storage updates

misc fixes

Author: jrivard

server/src/main/java/password/pwm/bean/UserIdentity.java

@@ -77,19 +77,12 @@ public LdapProfile getLdapProfile( final Configuration configuration )
         {
             return null;
         }
-        if ( configuration.getLdapProfiles().containsKey( this.getLdapProfileID() ) )
-        {
-            return configuration.getLdapProfiles().get( this.getLdapProfileID() );
-        }
-        else
-        {
-            return null;
-        }
+        return configuration.getLdapProfiles().getOrDefault( this.getLdapProfileID(), null );
     }
 
     public String toString( )
     {
-        return "UserIdentity" + JsonUtil.serialize( this );
+        return toDisplayString();
     }
 
     public String toObfuscatedKey( final PwmApplication pwmApplication )

server/src/main/java/password/pwm/config/stored/NGStorageEngineImpl.java

@@ -25,7 +25,7 @@
 import password.pwm.bean.UserIdentity;
 import password.pwm.config.StoredValue;
 
-interface StorageEngine
+public interface StorageEngine
 {
     StoredValue read( StoredConfigReference storedConfigReference );
 

server/src/main/java/password/pwm/config/stored/StorageEngine.java

@@ -22,15 +22,18 @@
 
 package password.pwm.config.stored;
 
+import lombok.Value;
+
 import java.io.Serializable;
 
-class StoredConfigReferenceBean implements StoredConfigReference, Serializable, Comparable
+@Value
+public class StoredConfigReferenceBean implements StoredConfigReference, Serializable, Comparable
 {
     private RecordType recordType;
     private String recordID;
     private String profileID;
 
-    StoredConfigReferenceBean( final RecordType type, final String recordID, final String profileID )
+    public StoredConfigReferenceBean( final RecordType type, final String recordID, final String profileID )
     {
         if ( type == null )
         {
@@ -47,36 +50,6 @@ class StoredConfigReferenceBean implements StoredConfigReference, Serializable,
         this.profileID = profileID;
     }
 
-    public RecordType getRecordType( )
-    {
-        return recordType;
-    }
-
-    public String getRecordID( )
-    {
-        return recordID;
-    }
-
-    @Override
-    public String getProfileID( )
-    {
-        return profileID;
-    }
-
-    @Override
-    public boolean equals( final Object o )
-    {
-        return o != null
-                && o instanceof StoredConfigReference
-                && toString().equals( o.toString() );
-
-    }
-
-    @Override
-    public int hashCode( )
-    {
-        return toString().hashCode();
-    }
 
     @Override
     public String toString( )

server/src/main/java/password/pwm/config/stored/StoredConfigReferenceBean.java

@@ -22,13 +22,15 @@
 
 package password.pwm.config.stored;
 
+import lombok.Builder;
 import lombok.Value;
 import password.pwm.bean.UserIdentity;
 
 import java.io.Serializable;
 import java.time.Instant;
 
 @Value
+@Builder( toBuilder = true )
 public class ValueMetaData implements Serializable
 {
     private Instant modifyDate;

server/src/main/java/password/pwm/config/stored/ValueMetaData.java

@@ -0,0 +1,101 @@
+/*
+ * Password Management Servlets (PWM)
+ * http://www.pwm-project.org
+ *
+ * Copyright (c) 2006-2009 Novell, Inc.
+ * Copyright (c) 2009-2018 The PWM Project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package password.pwm.config.stored.ng;
+
+import password.pwm.bean.UserIdentity;
+import password.pwm.config.StoredValue;
+import password.pwm.config.stored.StoredConfigReference;
+import password.pwm.config.stored.ValueMetaData;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+
+class NGStorageEngineImpl
+{
+    private final Map<StoredConfigReference, StoredValue> storedValues = new HashMap<>();
+    private final Map<StoredConfigReference, ValueMetaData> metaValues = new HashMap<>();
+
+    NGStorageEngineImpl()
+    {
+    }
+
+    NGStorageEngineImpl(
+            final Map<StoredConfigReference, StoredValue> storedValues,
+            final Map<StoredConfigReference, ValueMetaData> metaValues
+    )
+    {
+        this.storedValues.putAll( storedValues );
+        this.metaValues.putAll( metaValues );
+    }
+
+    StoredValue read( final StoredConfigReference storedConfigReference )
+    {
+        return storedValues.get( storedConfigReference );
+    }
+
+    ValueMetaData readMetaData( final StoredConfigReference storedConfigReference )
+    {
+        return metaValues.get( storedConfigReference );
+    }
+
+    void writeMetaData( final StoredConfigReference storedConfigReference, final ValueMetaData valueMetaData )
+    {
+        metaValues.put( storedConfigReference, valueMetaData );
+    }
+
+    void write( final StoredConfigReference reference, final StoredValue value, final UserIdentity userIdentity )
+    {
+        if ( reference != null )
+        {
+            if ( value != null )
+            {
+                storedValues.put( reference, value );
+            }
+
+            updateUserIdentity( reference, userIdentity );
+        }
+    }
+
+    void reset( final StoredConfigReference reference, final UserIdentity userIdentity )
+    {
+        if ( reference != null )
+        {
+            storedValues.remove( reference );
+            updateUserIdentity( reference, userIdentity );
+        }
+    }
+
+    private void updateUserIdentity(
+            final StoredConfigReference reference,
+            final UserIdentity userIdentity
+    )
+    {
+        metaValues.put(
+                reference,
+                ValueMetaData.builder().modifyDate( Instant.now() )
+                        .userIdentity( userIdentity )
+                        .build() );
+
+    }
+}