diff --git a/ipaacalib/java/src/ipaaca/AbstractIU.java b/ipaacalib/java/src/ipaaca/AbstractIU.java
index ba80690024b2962935d981692525198b73d33d35..1b487260c389f68fcea291c7cf53ba7d025da925 100644
--- a/ipaacalib/java/src/ipaaca/AbstractIU.java
+++ b/ipaacalib/java/src/ipaaca/AbstractIU.java
@@ -209,6 +209,8 @@ public abstract class AbstractIU
abstract void setPayload(List<PayloadItem> newItems, String writerName);
abstract void putIntoPayload(String key, String value, String writer);
+
+ abstract void putIntoPayload(Map<? extends String, ? extends String> newItems, String writer);
abstract void removeFromPayload(Object key, String writer);
diff --git a/ipaacalib/java/src/ipaaca/LocalIU.java b/ipaacalib/java/src/ipaaca/LocalIU.java
index 7e560c8ee9dcf73a4a75403a515a9216281fe4a5..ab6abdf1d7273e51e2ea16eb34a73a964114cf82 100644
--- a/ipaacalib/java/src/ipaaca/LocalIU.java
+++ b/ipaacalib/java/src/ipaaca/LocalIU.java
@@ -2,12 +2,14 @@ package ipaaca;
import ipaaca.protobuf.Ipaaca.IULinkUpdate;
import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate.Builder;
import ipaaca.protobuf.Ipaaca.LinkSet;
import ipaaca.protobuf.Ipaaca.PayloadItem;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
@@ -204,6 +206,34 @@ public class LocalIU extends AbstractIU
}
}
}
+
+ @Override
+ void putIntoPayload(Map<? extends String, ? extends String> newItems, String writer)
+ {
+ synchronized (getRevisionLock())
+ {
+ // set item locally
+ if (isCommitted())
+ {
+ throw new IUCommittedException(this);
+ }
+ increaseRevisionNumber();
+ if (isPublished())
+ {
+ Builder builder = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision(getRevision()).setIsDelta(true)
+ .setWriterName(writer == null ? getOwnerName() : writer);
+ for (Map.Entry<? extends String, ? extends String> item : newItems.entrySet())
+ {
+ PayloadItem newItem = PayloadItem.newBuilder().setKey(item.getKey()).setValue(item.getValue()).setType("") // TODO: fix this, default in .proto?
+ .build();
+ builder.addNewItems(newItem);
+
+ }
+ IUPayloadUpdate update = builder.build();
+ getOutputBuffer().sendIUPayloadUpdate(this, update);
+ }
+ }
+ }
@Override
public void commit()
diff --git a/ipaacalib/java/src/ipaaca/OutputBuffer.java b/ipaacalib/java/src/ipaaca/OutputBuffer.java
index 9d66806b7a976658263e35f58f88b29c00ff9526..5b77e7245b5bb993a707dae372462ca378044cdc 100644
--- a/ipaacalib/java/src/ipaaca/OutputBuffer.java
+++ b/ipaacalib/java/src/ipaaca/OutputBuffer.java
@@ -153,14 +153,20 @@ public class OutputBuffer extends Buffer
{
iu.getPayload().remove(k, update.getWriterName());
}
- for (PayloadItem pli : update.getNewItemsList())
+ if (update.getNewItemsList().size() > 0)
{
- iu.getPayload().put(pli.getKey(), pli.getValue(), update.getWriterName());
+ HashMap<String, String> payloadUpdate = new HashMap<String, String>();
+
+ for (PayloadItem pli : update.getNewItemsList())
+ {
+ payloadUpdate.put(pli.getKey(), pli.getValue());
+ // //iu.getPayload().put(pli.getKey(), pli.getValue(), update.getWriterName());
+ }
+ iu.getPayload().putAll(payloadUpdate, update.getWriterName());
}
}
else
{
-
iu.setPayload(update.getNewItemsList(), update.getWriterName());
}
callIuEventHandlers(update.getUid(), true, IUEventType.UPDATED, iu.getCategory());
diff --git a/ipaacalib/java/src/ipaaca/Payload.java b/ipaacalib/java/src/ipaaca/Payload.java
index eeaa8e797ed523cb21d7feb51ecc665c57314716..0a6e7e5010906298cac08d68481bad8e10e51259 100644
--- a/ipaacalib/java/src/ipaaca/Payload.java
+++ b/ipaacalib/java/src/ipaaca/Payload.java
@@ -216,9 +216,20 @@ public class Payload implements Map<String, String>
return put(key, value, null);
}
- public void putAll(Map<? extends String, ? extends String> m)
+
+ public void putAll(Map<? extends String, ? extends String> newItems)
{
- throw new RuntimeException("Not implemented");
+ putAll(newItems);
+ }
+
+ public void putAll(Map<? extends String, ? extends String> newItems, String writer)
+ {
+ iu.putIntoPayload(newItems, writer);
+ map.putAll(newItems);
+ }
+
+ public void merge(Map<? extends String, ? extends String> items) {
+ putAll(items, null);
}
public String remove(Object key)
diff --git a/ipaacalib/java/src/ipaaca/RemoteMessageIU.java b/ipaacalib/java/src/ipaaca/RemoteMessageIU.java
index cdcb66016d615427f75b775ce39c4568bec5accb..e9546cf3df130a6c12b8233065f2db0c035d509b 100644
--- a/ipaacalib/java/src/ipaaca/RemoteMessageIU.java
+++ b/ipaacalib/java/src/ipaaca/RemoteMessageIU.java
@@ -3,6 +3,7 @@ package ipaaca;
import ipaaca.protobuf.Ipaaca.PayloadItem;
import java.util.List;
+import java.util.Map;
import lombok.extern.slf4j.Slf4j;
@@ -48,6 +49,15 @@ public class RemoteMessageIU extends AbstractIU
payload.put(key,value);
log.info("Info: modifying a RemoteMessage only has local effects");
}
+
+ void putIntoPayload(Map<? extends String, ? extends String> newItems, String writer) {
+ for (Map.Entry<? extends String, ? extends String> item : newItems.entrySet())
+ {
+ payload.put(item.getKey(), item.getValue());
+ //System.out.println(entry.getKey() + "/" + entry.getValue());
+ }
+ log.info("Info: modifying a RemoteMessage only has local effects");
+ }
@Override
void removeFromPayload(Object key, String writer)
diff --git a/ipaacalib/java/src/ipaaca/RemotePushIU.java b/ipaacalib/java/src/ipaaca/RemotePushIU.java
index c5d32bcfa964f6db371515f6a69a549558dd28bd..2c82b5b66aabe674f957f931f7c30ffbf17b86db 100644
--- a/ipaacalib/java/src/ipaaca/RemotePushIU.java
+++ b/ipaacalib/java/src/ipaaca/RemotePushIU.java
@@ -6,10 +6,12 @@ import ipaaca.protobuf.Ipaaca.IULinkUpdate;
import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
import ipaaca.protobuf.Ipaaca.LinkSet;
import ipaaca.protobuf.Ipaaca.PayloadItem;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate.Builder;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -93,6 +95,47 @@ public class RemotePushIU extends AbstractIU
setRevision(newRevision);
}
+ @Override
+ void putIntoPayload(Map<? extends String, ? extends String> newItems, String writer)
+ {
+ if (isCommitted())
+ {
+ throw new IUCommittedException(this);
+ }
+ if (isReadOnly())
+ {
+ throw new IUReadOnlyException(this);
+ }
+ Builder builder = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision(getRevision()).setIsDelta(true)
+ .setWriterName(getBuffer().getUniqueName());
+ for (Map.Entry<? extends String, ? extends String> item : newItems.entrySet())
+ {
+ PayloadItem newItem = PayloadItem.newBuilder().setKey(item.getKey()).setValue(item.getValue()).setType("") // TODO: fix this, default in .proto?
+ .build();
+ builder.addNewItems(newItem);
+
+ }
+ IUPayloadUpdate update = builder.build();
+
+ RemoteServer server = getInputBuffer().getRemoteServer(this);
+ logger.debug("Remote server has methods {}", server.getMethods());
+ int newRevision;
+ try
+ {
+ newRevision = (Integer) server.call("updatePayload", update);
+ }
+ catch (RSBException e)
+ {
+ throw new RuntimeException(e);
+ }
+ if (newRevision == 0)
+ {
+ throw new IUUpdateFailedException(this);
+ }
+ System.err.print("************************ "); System.err.println(newRevision);
+ setRevision(newRevision);
+ }
+
// def commit(self):
// """Commit to this IU."""
// if self.read_only:
diff --git a/ipaacalib/java/src/ipaacademo/TextPrinter.java b/ipaacalib/java/src/ipaacademo/TextPrinter.java
index ee494c8152e227a6f53a9ab7f4d7a37e8f18713f..f997a28d36f1307913cbed3c18029aca5868e464 100644
--- a/ipaacalib/java/src/ipaacademo/TextPrinter.java
+++ b/ipaacalib/java/src/ipaacademo/TextPrinter.java
@@ -31,6 +31,8 @@ public class TextPrinter
case COMMITTED: System.out.println("IU committed"); break;
case UPDATED: System.out.println("IU updated "+iu.getPayload()); break;
case LINKSUPDATED: System.out.println("IU links updated"); break;
+ case RETRACTED: break;
+ case DELETED: break;
}
}
diff --git a/ipaacalib/java/test/src/ipaaca/ComponentPushCommunicationIntegrationTest.java b/ipaacalib/java/test/src/ipaaca/ComponentPushCommunicationIntegrationTest.java
index 32b2bf4dd6f76b8bcc3317142edbf308066cde28..e0fa2bf69dba0c3aa55d570096108d470756e260 100644
--- a/ipaacalib/java/test/src/ipaaca/ComponentPushCommunicationIntegrationTest.java
+++ b/ipaacalib/java/test/src/ipaaca/ComponentPushCommunicationIntegrationTest.java
@@ -10,6 +10,7 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.Set;
import org.junit.After;
@@ -170,6 +171,42 @@ public class ComponentPushCommunicationIntegrationTest
assertEquals(1,component1EventHandler.getNumberOfUpdateEvents(localIU.getUid()));
}
+ @Test
+ public void testSetAllPayload() throws InterruptedException
+ {
+ outBuffer.add(localIU);
+ Thread.sleep(200);
+ AbstractIU iuIn = inBuffer.getIU(localIU.getUid());
+
+ HashMap<String, String> payloadUpdate = new HashMap<String, String>();
+ payloadUpdate.put("chunk11", "item1");
+ payloadUpdate.put("chunk12", "item2");
+ payloadUpdate.put("chunk13", "item3");
+ payloadUpdate.put("chunk14", "item4");
+ int oldRev = iuIn.getRevision();
+ localIU.getPayload().merge(payloadUpdate);
+ Thread.sleep(200);
+ assertEquals(oldRev + 1, iuIn.getRevision());
+ assertTrue(iuIn.getPayload().containsKey("chunk11"));
+ assertTrue(iuIn.getPayload().containsKey("chunk12"));
+ assertTrue(iuIn.getPayload().containsKey("chunk13"));
+ assertTrue(iuIn.getPayload().containsKey("chunk14"));
+
+ HashMap<String, String> payloadUpdate2 = new HashMap<String, String>();
+ payloadUpdate2.put("chunk21", "item5");
+ payloadUpdate2.put("chunk22", "item6");
+ payloadUpdate2.put("chunk13", "item3-changed");
+ payloadUpdate2.put("chunk14", "item4-changed");
+ int oldRev2 = iuIn.getRevision();
+ iuIn.getPayload().merge(payloadUpdate2);
+ Thread.sleep(200);
+ assertEquals(oldRev2 + 1, localIU.getRevision());
+ assertTrue(localIU.getPayload().containsKey("chunk21"));
+ assertTrue(localIU.getPayload().containsKey("chunk22"));
+ assertEquals("item3-changed", localIU.getPayload().get("chunk13"));
+ assertEquals("item4-changed", localIU.getPayload().get("chunk14"));
+ }
+
@Test
public void testIUUpdateFromInputBuffer() throws InterruptedException
{