wip

Author: rymsha

modules/core/core-app/src/main/java/com/enonic/xp/core/impl/app/ApplicationRepoService.java

@@ -10,9 +10,7 @@
 
 interface ApplicationRepoService
 {
-    Node createApplicationNode( Application application, ByteSource source );
-
-    Node updateApplicationNode( Application application, ByteSource source );
+    Node upsertApplicationNode( Application application, ByteSource source );
 
     void deleteApplicationNode( ApplicationKey application );
 
@@ -23,5 +21,4 @@ interface ApplicationRepoService
     Nodes getApplications();
 
     Node updateStartedState( ApplicationKey applicationKey, boolean started );
-
 }

modules/core/core-app/src/main/java/com/enonic/xp/core/impl/app/ApplicationRepoServiceImpl.java

@@ -31,15 +31,16 @@ public ApplicationRepoServiceImpl( final NodeService nodeService )
     }
 
     @Override
-    public Node createApplicationNode( final Application application, final ByteSource source )
+    public Node upsertApplicationNode( final Application application, final ByteSource source )
     {
-        return this.nodeService.create( ApplicationNodeTransformer.toCreateNodeParams( application, source ) );
-    }
-
-    @Override
-    public Node updateApplicationNode( final Application application, final ByteSource source )
-    {
-        return this.nodeService.update( ApplicationNodeTransformer.toUpdateNodeParams( application, source ) );
+        if ( doGetNodeByName( application.getKey().getName() ) != null )
+        {
+            return this.nodeService.update( ApplicationNodeTransformer.toUpdateNodeParams( application, source ) );
+        }
+        else
+        {
+            return this.nodeService.create( ApplicationNodeTransformer.toCreateNodeParams( application, source ) );
+        }
     }
 
     @Override