Continued work on REST API.

JumpMind · Nov 24, 2012 · 3d3c028 · 3d3c028
1 parent fadb4a7
commit 3d3c028
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java
@@ -600,7 +600,12 @@ private String generateInstallScriptImpl(ISymmetricEngine engine) {
     }
 
     private void reinitializeImpl(ISymmetricEngine engine) {
-    	//TODO: implement
+    	INodeService nodeService = engine.getNodeService();
+    	org.jumpmind.symmetric.model.Node modelNode = nodeService.findIdentity();
+
+    	if (!this.isRootNode(engine, modelNode)) {
+    		engine.uninstall();
+    	}
     }
 
     private void refreshCacheImpl(ISymmetricEngine engine) {
@@ -641,6 +646,7 @@ private NodeList childrenImpl(ISymmetricEngine engine) {
     			xmlChildNode = new Node();
     			xmlChildNode.setName(child.getNode().getNodeId());
     			xmlChildNode.setRootNode(false);
+    			xmlChildNode.setSyncUrl(child.getNode().getSyncUrl());
     			children.addNode(xmlChildNode);
     		}
     	}
@@ -654,6 +660,7 @@ private Node nodeImpl(ISymmetricEngine engine) {
     	org.jumpmind.symmetric.model.Node modelNode = nodeService.findIdentity();    	
     	xmlNode.setName(modelNode.getNodeId());
     	xmlNode.setRootNode(isRootNode(engine, modelNode));
+    	xmlNode.setSyncUrl(modelNode.getSyncUrl());
     	return xmlNode;    	
     }
 

diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/model/Node.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/model/Node.java
@@ -27,8 +27,17 @@ public class Node {
 
     private String name;
     private boolean isRootNode;
+    private String syncUrl;
 
-    public boolean isRootNode() {
+    public String getSyncUrl() {
+		return syncUrl;
+	}
+
+	public void setSyncUrl(String syncUrl) {
+		this.syncUrl = syncUrl;
+	}
+
+	public boolean isRootNode() {
 		return isRootNode;
 	}