Merge pull request #294 in ZX/zextras from bugfix/ZX-2733-zimlet-norm…

…alizer-explode to release/1.9.1

* commit 'ed23252ce78a82c20ae59611eff696dafc58a8a6':
  ZX-2733 ZAL: Now Provisioning.getZimlet() now throws an exception if the zimlet is null.
  ZX-2733 ZxCore: Zimlet are now normalized correctly even when one of them doesn't have a priority.

src/java/org/openzal/zal/Provisioning.java

@@ -581,7 +581,7 @@ public List<Domain> getAllDomains()
     }
   }
 
-  @Nullable
+  @NotNull
   public Zimlet getZimlet(String zimletName)
     throws ZimbraException
   {
@@ -590,7 +590,7 @@ public Zimlet getZimlet(String zimletName)
       com.zimbra.cs.account.Zimlet zimlet = mProvisioning.getZimlet(zimletName);
       if (zimlet == null)
       {
-        return null;
+        throw ExceptionWrapper.createNoSuchZimletException("Zimlet " + zimletName + " not found.");
       }
       else
       {
@@ -599,7 +599,7 @@ public Zimlet getZimlet(String zimletName)
     }
     catch (com.zimbra.common.service.ServiceException e)
     {
-      throw ExceptionWrapper.wrap(e);
+      throw ExceptionWrapper.createNoSuchZimletException(e);
     }
   }
 

src/java/org/openzal/zal/Utils.java

@@ -52,6 +52,7 @@
 import javax.mail.MessagingException;
 import javax.mail.Session;
 import java.io.*;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -117,11 +118,21 @@ public static String encode(Map<String, Object> attrs)
   @Nullable
   public static List<Zimlet> orderZimletsByPriority(List<Zimlet> zimlets)
   {
+    List<com.zimbra.cs.account.Zimlet> zimbraZimletList =
+      new ArrayList<com.zimbra.cs.account.Zimlet>(zimlets.size());
+
     for (Zimlet zimlet : zimlets)
     {
-      zimlet.getPriority();
+      zimbraZimletList.add(zimlet.toZimbra());
     }
-    return null;
+
+    List<Zimlet> orderedZimletList = new ArrayList<Zimlet>(zimlets.size());
+    for (com.zimbra.cs.account.Zimlet zimlet : ZimletUtil.orderZimletsByPriority(zimbraZimletList))
+    {
+      orderedZimletList.add(new Zimlet(zimlet));
+    }
+
+    return orderedZimletList;
   }
 
   public static String getPublicURLForDomain(Server server, Domain domain, String path)

src/java/org/openzal/zal/exceptions/ExceptionWrapper.java

@@ -351,4 +351,18 @@ public static UnableToObtainDBConnectionException createUnableToObtainDBConnecti
   {
     throw new UnableToObtainDBConnectionException(e);
   }
+
+  public static NoSuchZimletException createNoSuchZimletException(
+    com.zimbra.common.service.ServiceException e
+  )
+  {
+    throw new NoSuchZimletException(e);
+  }
+
+  public static NoSuchZimletException createNoSuchZimletException(
+    String msg
+  )
+  {
+    throw new NoSuchZimletException(msg);
+  }
 }

src/java/org/openzal/zal/exceptions/NoSuchZimletException.java

@@ -0,0 +1,7 @@
+package org.openzal.zal.exceptions;
+
+public class NoSuchZimletException extends ZimbraException
+{
+  public NoSuchZimletException(Exception exception) {super(exception);}
+  public NoSuchZimletException(String msg) {super(msg);}
+}

tests/java/org/openzal/zal/ProvisioningSimulator.java

@@ -234,6 +234,7 @@ public List<Domain> getAllDomains()
     throw new RuntimeException("Provisioning method not implemented");
   }
 
+  @NotNull
   public Zimlet getZimlet(String zimletName)
       throws ZimbraException
   {