Attempt to fix Message-type IUs not being broadcast with MESSAGE type

ipaacalib/java/src/ipaaca/AbstractIU.java

@@ -32,6 +32,7 @@
 
 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca.IU;
 import ipaaca.protobuf.Ipaaca.PayloadItem;
 
 import java.util.ArrayList;
@@ -62,6 +63,8 @@ public abstract class AbstractIU
     protected long revision;
     private boolean readOnly = false;
 
+    public abstract IU.AccessMode getAccessMode();
+    
     protected SetMultimap<String, String> links = HashMultimap.create();
     private final SetMultimap<String, String> EMPTYLINKS = HashMultimap.create();
 

ipaacalib/java/src/ipaaca/IUConverter.java

@@ -88,11 +88,11 @@ public class IUConverter implements Converter<ByteBuffer>
             links.add(LinkSet.newBuilder().setType(entry.getKey()).addAllTargets(entry.getValue()).build());
         }
 
-        IU.AccessMode accessMode = IU.AccessMode.PUSH;
-        if(iua instanceof RemoteMessageIU || iua instanceof LocalMessageIU)
-        {
-            accessMode = IU.AccessMode.MESSAGE;
-        }
+        IU.AccessMode accessMode = iua.getAccessMode();  //IU.AccessMode.PUSH;
+        //if(obj instanceof RemoteMessageIU || obj instanceof LocalMessageIU)
+        //{
+        //    accessMode = IU.AccessMode.MESSAGE;
+        //}
         IU iu = IU.newBuilder().setUid(iua.getUid()).setRevision((int) iua.getRevision()).setCategory(iua.getCategory())
                 .setOwnerName(iua.getOwnerName()).setCommitted(iua.isCommitted()).setAccessMode(accessMode)
                 .setReadOnly(iua.isReadOnly()).setPayloadType("STR").addAllPayload(payloadItems).addAllLinks(links).build();

ipaacalib/java/src/ipaaca/LocalIU.java

@@ -32,6 +32,7 @@
 
 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca.IU;
 import ipaaca.protobuf.Ipaaca.IULinkUpdate;
 import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 import ipaaca.protobuf.Ipaaca.IUPayloadUpdate.Builder;
@@ -50,6 +51,11 @@ import com.google.common.collect.SetMultimap;
 
 public class LocalIU extends AbstractIU
 {
+    
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.PUSH;
+    }
 
     private OutputBuffer outputBuffer;
 

ipaacalib/java/src/ipaaca/LocalMessageIU.java

@@ -32,6 +32,7 @@
 
 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca.IU;
 
 /**
  * Local IU of Message sub-type. Can be handled like a normal IU, but on the remote side it is only existent during the handler calls.
@@ -50,4 +51,9 @@ public class LocalMessageIU extends LocalIU
         super(category);
     }
 
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.MESSAGE;
+    }
+
 }

ipaacalib/java/src/ipaaca/RemoteMessageIU.java

@@ -32,6 +32,7 @@
 
 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca.IU;
 import ipaaca.protobuf.Ipaaca.PayloadItem;
 
 import java.util.List;
@@ -45,6 +46,11 @@ import com.google.common.collect.SetMultimap;
 public class RemoteMessageIU extends AbstractIU
 {
 
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.MESSAGE;
+    }
+
     public RemoteMessageIU(String uid)
     {
         super(uid);

ipaacalib/java/src/ipaaca/RemotePushIU.java

@@ -33,6 +33,7 @@
 package ipaaca;
 
 import ipaaca.protobuf.Ipaaca;
+import ipaaca.protobuf.Ipaaca.IU;
 import ipaaca.protobuf.Ipaaca.IUCommission;
 import ipaaca.protobuf.Ipaaca.IULinkUpdate;
 import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
@@ -66,6 +67,11 @@ public class RemotePushIU extends AbstractIU
     private final static Logger logger = LoggerFactory.getLogger(RemotePushIU.class.getName());
     private InputBuffer inputBuffer;
 
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.PUSH;
+    }
+
     public InputBuffer getInputBuffer()
     {
         return inputBuffer;