Slightly improved

Author: phax

as2-partnership-mongodb/src/main/java/com/helger/as2lib/partner/mongodb/MongoDBPartnershipFactory.java

@@ -18,6 +18,7 @@
 import java.util.Map;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.bson.Document;
 import org.slf4j.Logger;
@@ -32,6 +33,7 @@
 import com.helger.as2lib.partner.IPartnershipFactory;
 import com.helger.as2lib.partner.Partnership;
 import com.helger.commons.annotation.CodingStyleguideUnaware;
+import com.helger.commons.annotation.ReturnsMutableCopy;
 import com.helger.commons.collection.attr.IStringMap;
 import com.helger.commons.collection.impl.CommonsArrayList;
 import com.helger.commons.collection.impl.CommonsHashMap;
@@ -60,38 +62,58 @@ public class MongoDBPartnershipFactory extends AbstractDynamicComponent implemen
   private final MongoCollection <Document> m_aPartnerships;
   private final Logger m_aLogger;
 
-  public MongoDBPartnershipFactory (final MongoCollection <Document> aPartnerships, @Nonnull final Logger aLogger)
+  public MongoDBPartnershipFactory (@Nonnull final MongoCollection <Document> aPartnerships,
+                                    @Nonnull final Logger aLogger)
   {
     m_aLogger = aLogger;
     aPartnerships.createIndex (new Document (NAME_KEY, Integer.valueOf (1)), new IndexOptions ().unique (true));
     m_aPartnerships = aPartnerships;
   }
 
-  @Override
-  public EChange addPartnership (final Partnership aPartnership) throws AS2Exception
+  @Nonnull
+  private static Document _toBson (@Nonnull final IStringMap aStringMap)
   {
-    m_aPartnerships.insertOne (_toDocument (aPartnership));
+    final Document ret = new Document ();
+    for (final Map.Entry <String, String> aEntry : aStringMap.entrySet ())
+      ret.put (aEntry.getKey (), aEntry.getValue ());
+    return ret;
+  }
+
+  @Nonnull
+  private static Document _toBson (@Nonnull final Partnership aPartnership)
+  {
+    final Document ret = new Document ();
+    ret.put (NAME_KEY, aPartnership.getName ());
+    ret.put (RECEIVER_IDS, _toBson (aPartnership.getAllReceiverIDs ()));
+    ret.put (SENDER_IDS, _toBson (aPartnership.getAllSenderIDs ()));
+    ret.put (ATTRIBUTES, _toBson (aPartnership.getAllAttributes ()));
+    return ret;
+  }
+
+  @Nonnull
+  public EChange addPartnership (@Nonnull final Partnership aPartnership) throws AS2Exception
+  {
+    m_aPartnerships.insertOne (_toBson (aPartnership));
     return EChange.CHANGED;
   }
 
-  @Override
-  public EChange removePartnership (final Partnership aPartnership) throws AS2Exception
+  @Nonnull
+  public EChange removePartnership (@Nonnull final Partnership aPartnership) throws AS2Exception
   {
-    final DeleteResult result = m_aPartnerships.deleteOne (new Document (NAME_KEY, aPartnership.getName ()));
-    if (result.getDeletedCount () >= 1l)
-    {
+    final DeleteResult aDeleteResult = m_aPartnerships.deleteOne (new Document (NAME_KEY, aPartnership.getName ()));
+    if (aDeleteResult.getDeletedCount () >= 1L)
       return EChange.CHANGED;
-    }
+
     return EChange.UNCHANGED;
   }
 
-  @Override
-  public void updatePartnership (final IMessage aMsg, final boolean bOverwrite) throws AS2Exception
+  public void updatePartnership (@Nonnull final IMessage aMsg, final boolean bOverwrite) throws AS2Exception
   {
     // Fill in any available partnership information
     final Partnership aPartnership = getPartnership (aMsg.partnership ());
 
-    m_aLogger.debug ("Updating partnership {}", aPartnership);
+    if (m_aLogger.isDebugEnabled ())
+      m_aLogger.debug ("Updating partnership {}", aPartnership);
 
     // Update partnership data of message with the stored ones
     aMsg.partnership ().copyFrom (aPartnership);
@@ -107,143 +129,114 @@ public void updatePartnership (final IMessage aMsg, final boolean bOverwrite) th
     }
   }
 
-  @Override
-  public void updatePartnership (final IMessageMDN aMdn, final boolean bOverwrite) throws AS2Exception
+  public void updatePartnership (@Nonnull final IMessageMDN aMdn, final boolean bOverwrite) throws AS2Exception
   {
     final Partnership aPartnership = getPartnership (aMdn.partnership ());
     aMdn.partnership ().copyFrom (aPartnership);
   }
 
-  @Override
-  public Partnership getPartnership (final Partnership aPartnership) throws AS2Exception
+  @Nullable
+  private Partnership _getPartnershipByID (final IStringMap aAllSenderIDs, final IStringMap aAllReceiverIDs)
   {
-    Partnership aRealPartnership = getPartnershipByName (aPartnership.getName ());
-    if (aRealPartnership == null)
-    {
-      // Found no partnership by name
-      aRealPartnership = getPartnershipByID (aPartnership.getAllSenderIDs (), aPartnership.getAllReceiverIDs ());
-    }
-
-    if (aRealPartnership == null)
-    {
-      throw new AS2PartnershipNotFoundException (aPartnership);
-    }
-    return aRealPartnership;
-  }
+    Document aFilter = new Document ();
+    for (final Map.Entry <String, String> aEntry : aAllSenderIDs.entrySet ())
+      aFilter.append (SENDER_IDS + "." + aEntry.getKey (), aEntry.getValue ());
 
-  private Partnership getPartnershipByID (final IStringMap allSenderIDs, final IStringMap allReceiverIDs)
-  {
-    Document filter = new Document ();
-    for (final Map.Entry <String, String> entry : allSenderIDs.entrySet ())
-    {
-      filter.append (SENDER_IDS + "." + entry.getKey (), entry.getValue ());
-    }
-    for (final Map.Entry <String, String> entry : allReceiverIDs.entrySet ())
-    {
-      filter.append (RECEIVER_IDS + "." + entry.getKey (), entry.getValue ());
-    }
+    for (final Map.Entry <String, String> aEntry : aAllReceiverIDs.entrySet ())
+      aFilter.append (RECEIVER_IDS + "." + aEntry.getKey (), aEntry.getValue ());
 
-    Partnership result = m_aPartnerships.find (filter).map (MongoDBPartnershipFactory::_toPartnership).first ();
-    if (result != null)
-    {
-      return result;
-    }
+    Partnership ret = m_aPartnerships.find (aFilter).map (MongoDBPartnershipFactory::_toPartnership).first ();
+    if (ret != null)
+      return ret;
 
     // try the other way around, maybe we're receiving a response
     // TODO is this really a good idea?
-    filter = new Document ();
-    for (final Map.Entry <String, String> entry : allSenderIDs.entrySet ())
-    {
-      filter.append (RECEIVER_IDS + "." + entry.getKey (), entry.getValue ());
-    }
-    for (final Map.Entry <String, String> entry : allReceiverIDs.entrySet ())
+    aFilter = new Document ();
+    for (final Map.Entry <String, String> entry : aAllSenderIDs.entrySet ())
+      aFilter.append (RECEIVER_IDS + "." + entry.getKey (), entry.getValue ());
+    for (final Map.Entry <String, String> entry : aAllReceiverIDs.entrySet ())
+      aFilter.append (SENDER_IDS + "." + entry.getKey (), entry.getValue ());
+
+    final Partnership aInverseResult = m_aPartnerships.find (aFilter)
+                                                      .map (MongoDBPartnershipFactory::_toPartnership)
+                                                      .first ();
+    if (aInverseResult != null)
     {
-      filter.append (SENDER_IDS + "." + entry.getKey (), entry.getValue ());
+      // Create an inverse partnership
+      ret = new Partnership (aInverseResult.getName () + "-inverse");
+      ret.setReceiverX509Alias (aInverseResult.getSenderX509Alias ());
+      ret.setReceiverAS2ID (aInverseResult.getSenderAS2ID ());
+      ret.setSenderX509Alias (aInverseResult.getReceiverX509Alias ());
+      ret.setSenderAS2ID (aInverseResult.getReceiverAS2ID ());
+      return ret;
     }
+    return null;
+  }
 
-    final Partnership inverseResult = m_aPartnerships.find (filter).map (MongoDBPartnershipFactory::_toPartnership).first ();
-    if (inverseResult != null)
+  @Nonnull
+  public Partnership getPartnership (@Nonnull final Partnership aPartnership) throws AS2Exception
+  {
+    Partnership aRealPartnership = getPartnershipByName (aPartnership.getName ());
+    if (aRealPartnership == null)
     {
-      result = new Partnership (inverseResult.getName () + "-inverse");
-      result.setReceiverX509Alias (inverseResult.getSenderX509Alias ());
-      result.setReceiverAS2ID (inverseResult.getSenderAS2ID ());
-      result.setSenderX509Alias (inverseResult.getReceiverX509Alias ());
-      result.setSenderAS2ID (inverseResult.getReceiverAS2ID ());
-
-      return result;
+      // Found no partnership by name
+      aRealPartnership = _getPartnershipByID (aPartnership.getAllSenderIDs (), aPartnership.getAllReceiverIDs ());
     }
-    return null;
 
+    if (aRealPartnership == null)
+      throw new AS2PartnershipNotFoundException (aPartnership);
+
+    return aRealPartnership;
   }
 
-  @Override
-  public Partnership getPartnershipByName (final String sName)
+  @Nullable
+  public Partnership getPartnershipByName (@Nullable final String sName)
   {
-    return m_aPartnerships.find (new Document (NAME_KEY, sName)).map (MongoDBPartnershipFactory::_toPartnership).first ();
+    if (sName == null)
+      return null;
+    return m_aPartnerships.find (new Document (NAME_KEY, sName))
+                          .map (MongoDBPartnershipFactory::_toPartnership)
+                          .first ();
   }
 
-  @Override
+  @Nonnull
+  @ReturnsMutableCopy
   public ICommonsSet <String> getAllPartnershipNames ()
   {
     return m_aPartnerships.distinct (NAME_KEY, String.class).into (new CommonsHashSet <> ());
   }
 
-  @Override
+  @Nonnull
+  @ReturnsMutableCopy
   public ICommonsList <Partnership> getAllPartnerships ()
   {
     return m_aPartnerships.find ().map (MongoDBPartnershipFactory::_toPartnership).into (new CommonsArrayList <> ());
   }
 
-  private static Document _toDocument (final IStringMap stringMap)
+  @Nonnull
+  private static Partnership _toPartnership (@Nonnull final Document aBson)
   {
-    final Document document = new Document ();
-    for (final Map.Entry <String, String> entry : stringMap.entrySet ())
+    final Partnership ret = new Partnership (aBson.getString (NAME_KEY));
+    final Document aBsonSenderIDs = (Document) aBson.get (SENDER_IDS);
+    final ICommonsMap <String, String> aSenderIDs = new CommonsHashMap <> (aBsonSenderIDs.size ());
+    for (final Map.Entry <String, Object> aEntry : aBsonSenderIDs.entrySet ())
+      aSenderIDs.put (aEntry.getKey (), aEntry.getValue ().toString ());
+    ret.addSenderIDs (aSenderIDs);
+
+    final Document aBsonReceiverIDs = (Document) aBson.get (RECEIVER_IDS);
+    final ICommonsMap <String, String> aReceiverIDs = new CommonsHashMap <> (aBsonReceiverIDs.size ());
+    for (final Map.Entry <String, Object> aEntry : aBsonReceiverIDs.entrySet ())
+      aReceiverIDs.put (aEntry.getKey (), aEntry.getValue ().toString ());
+    ret.addReceiverIDs (aReceiverIDs);
+
+    final Document aBsonAttributes = (Document) aBson.get (ATTRIBUTES);
+    if (aBsonAttributes != null)
     {
-      document.put (entry.getKey (), entry.getValue ());
-    }
-    return document;
-  }
-
-  private static Document _toDocument (final Partnership partnership)
-  {
-    final Document document = new Document ();
-    document.put (NAME_KEY, partnership.getName ());
-    document.put (RECEIVER_IDS, _toDocument (partnership.getAllReceiverIDs ()));
-    document.put (SENDER_IDS, _toDocument (partnership.getAllSenderIDs ()));
-    document.put (ATTRIBUTES, _toDocument (partnership.getAllAttributes ()));
-
-    return document;
-  }
-
-  private static Partnership _toPartnership (final Document document)
-  {
-    final Partnership partnership = new Partnership (document.getString (NAME_KEY));
-    final Document senderIDs = (Document) document.get (SENDER_IDS);
-    final ICommonsMap <String, String> senders = new CommonsHashMap <> (senderIDs.size ());
-    for (final Map.Entry <String, Object> e : senderIDs.entrySet ())
-    {
-      senders.put (e.getKey (), e.getValue ().toString ());
-    }
-    partnership.addSenderIDs (senders);
-
-    final Document receiverIDs = (Document) document.get (RECEIVER_IDS);
-    final ICommonsMap <String, String> receivers = new CommonsHashMap <> (receiverIDs.size ());
-    for (final Map.Entry <String, Object> e : receiverIDs.entrySet ())
-    {
-      receivers.put (e.getKey (), e.getValue ().toString ());
-    }
-    partnership.addReceiverIDs (receivers);
-
-    final Document attributes = (Document) document.get (ATTRIBUTES);
-    if (attributes != null)
-    {
-      final ICommonsMap <String, String> att = new CommonsHashMap <> (receiverIDs.size ());
-      for (final Map.Entry <String, Object> e : attributes.entrySet ())
-      {
-        att.put (e.getKey (), e.getValue ().toString ());
-      }
-      partnership.addAllAttributes (att);
+      final ICommonsMap <String, String> aAttrs = new CommonsHashMap <> (aBsonReceiverIDs.size ());
+      for (final Map.Entry <String, Object> aEntry : aBsonAttributes.entrySet ())
+        aAttrs.put (aEntry.getKey (), aEntry.getValue ().toString ());
+      ret.addAllAttributes (aAttrs);
     }
-    return partnership;
+    return ret;
   }
 }