BZ-1063436: avoid double commits by checking if file exists instead o…

…f createFile
kiegroup · Feb 10, 2014 · 4110396 · 4110396
1 parent e34779a
commit 4110396
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 11 deletions.
diff --git a/...in/java/org/drools/workbench/screens/drltext/backend/server/DRLTextEditorServiceImpl.java b/...in/java/org/drools/workbench/screens/drltext/backend/server/DRLTextEditorServiceImpl.java
@@ -51,6 +51,7 @@
 import org.uberfire.io.IOService;
 import org.uberfire.java.nio.base.options.CommentedOption;
 import org.uberfire.java.nio.file.DirectoryStream;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
@@ -109,7 +110,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              drl,
                              makeCommentedOption( comment ) );

diff --git a/...in/java/org/drools/workbench/screens/dsltext/backend/server/DSLTextEditorServiceImpl.java b/...in/java/org/drools/workbench/screens/dsltext/backend/server/DSLTextEditorServiceImpl.java
@@ -43,6 +43,7 @@
 import org.uberfire.java.nio.base.options.CommentedOption;
 import org.uberfire.backend.server.util.Paths;
 import org.uberfire.backend.vfs.Path;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
@@ -91,7 +92,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              content,
                              makeCommentedOption( comment ) );

diff --git a/...kend/src/main/java/org/drools/workbench/screens/enums/backend/server/EnumServiceImpl.java b/...kend/src/main/java/org/drools/workbench/screens/enums/backend/server/EnumServiceImpl.java
@@ -43,6 +43,7 @@
 import org.kie.workbench.common.services.datamodel.backend.server.builder.util.DataEnumLoader;
 import org.uberfire.backend.server.util.Paths;
 import org.uberfire.backend.vfs.Path;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
@@ -94,7 +95,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              content,
                              makeCommentedOption( comment ) );

diff --git a/...in/java/org/drools/workbench/screens/globals/backend/server/GlobalsEditorServiceImpl.java b/...in/java/org/drools/workbench/screens/globals/backend/server/GlobalsEditorServiceImpl.java
@@ -50,6 +50,7 @@
 import org.kie.workbench.common.services.datamodel.backend.server.service.DataModelService;
 import org.uberfire.backend.server.util.Paths;
 import org.uberfire.backend.vfs.Path;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
@@ -113,7 +114,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              GlobalsPersistence.getInstance().marshal( content ),
                              makeCommentedOption( comment ) );

diff --git a/.../workbench/screens/guided/dtable/backend/server/GuidedDecisionTableEditorServiceImpl.java b/.../workbench/screens/guided/dtable/backend/server/GuidedDecisionTableEditorServiceImpl.java
@@ -36,7 +36,6 @@
 import org.guvnor.common.services.backend.exceptions.ExceptionUtilities;
 import org.guvnor.common.services.backend.file.JavaFileFilter;
 import org.guvnor.common.services.backend.validation.GenericValidator;
-import org.guvnor.common.services.project.builder.events.InvalidateDMOProjectCacheEvent;
 import org.guvnor.common.services.project.model.Package;
 import org.guvnor.common.services.project.service.ProjectService;
 import org.guvnor.common.services.shared.file.CopyService;
@@ -56,6 +55,7 @@
 import org.uberfire.backend.vfs.Path;
 import org.uberfire.io.IOService;
 import org.uberfire.java.nio.base.options.CommentedOption;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
@@ -123,7 +123,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              GuidedDTXMLPersistence.getInstance().marshal( content ),
                              makeCommentedOption( comment ) );

diff --git a/.../org/drools/workbench/screens/guided/rule/backend/server/GuidedRuleEditorServiceImpl.java b/.../org/drools/workbench/screens/guided/rule/backend/server/GuidedRuleEditorServiceImpl.java
@@ -51,6 +51,7 @@
 import org.uberfire.backend.server.util.Paths;
 import org.uberfire.backend.vfs.Path;
 import org.uberfire.io.IOService;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
 
@@ -119,7 +120,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              toSource( newPath,
                                        model ),

diff --git a/...s/workbench/screens/guided/scorecard/backend/server/GuidedScoreCardEditorServiceImpl.java b/...s/workbench/screens/guided/scorecard/backend/server/GuidedScoreCardEditorServiceImpl.java
@@ -50,6 +50,7 @@
 import org.uberfire.backend.vfs.Path;
 import org.uberfire.io.IOService;
 import org.uberfire.java.nio.base.options.CommentedOption;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
@@ -105,7 +106,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              GuidedScoreCardXMLPersistence.getInstance().marshal( content ),
                              makeCommentedOption( comment ) );

diff --git a/.../drools/workbench/screens/guided/template/server/GuidedRuleTemplateEditorServiceImpl.java b/.../drools/workbench/screens/guided/template/server/GuidedRuleTemplateEditorServiceImpl.java
@@ -53,6 +53,7 @@
 import org.uberfire.backend.server.util.Paths;
 import org.uberfire.backend.vfs.Path;
 import org.uberfire.io.IOService;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
 
@@ -118,7 +119,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              RuleTemplateModelXMLPersistenceImpl.getInstance().marshal( content ),
                              utilities.makeCommentedOption( comment ) );

diff --git a/...g/drools/workbench/screens/testscenario/backend/server/ScenarioTestEditorServiceImpl.java b/...g/drools/workbench/screens/testscenario/backend/server/ScenarioTestEditorServiceImpl.java
@@ -57,6 +57,7 @@
 import org.uberfire.io.IOService;
 import org.uberfire.java.nio.base.options.CommentedOption;
 import org.uberfire.java.nio.file.DirectoryStream;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.java.nio.file.Files;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
@@ -116,7 +117,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              ScenarioXMLPersistence.getInstance().marshal( content ),
                              makeCommentedOption( comment ) );

diff --git a/...ava/org/drools/workbench/screens/workitems/backend/server/WorkItemsEditorServiceImpl.java b/...ava/org/drools/workbench/screens/workitems/backend/server/WorkItemsEditorServiceImpl.java
@@ -71,6 +71,7 @@
 import org.uberfire.backend.vfs.Path;
 import org.uberfire.io.IOService;
 import org.uberfire.java.nio.base.options.CommentedOption;
+import org.uberfire.java.nio.file.FileAlreadyExistsException;
 import org.uberfire.rpc.SessionInfo;
 import org.uberfire.security.Identity;
 import org.uberfire.workbench.events.ResourceOpenedEvent;
@@ -166,7 +167,10 @@ public Path create( final Path context,
             final org.uberfire.java.nio.file.Path nioPath = Paths.convert( context ).resolve( fileName );
             final Path newPath = Paths.convert( nioPath );
 
-            ioService.createFile( nioPath );
+            if ( ioService.exists( nioPath ) ) {
+                throw new FileAlreadyExistsException( nioPath.toString() );
+            }
+
             ioService.write( nioPath,
                              defaultDefinition,
                              makeCommentedOption( comment ) );