perf

Author: rmpestano

src/main/java/com/github/adminfaces/addon/scaffold/AdminFacesScaffoldProvider.java

@@ -119,10 +119,40 @@ public List<Resource<?>> setup(ScaffoldSetupContext setupContext) {
         AdminScaffoldUtils.setupAdminPersistence(project,dependencyUtil, facetFactory);
         createScaffoldConfig(project);
         addAppListCache(project);
+        setupPersistenceXml(project);
         return Collections.emptyList();
     }
 
-    /**
+    private void setupPersistenceXml(Project project) {
+    	DirectoryResource resourceDirectory = project.getFacet(ResourcesFacet.class).getResourceDirectory();
+        FileResource<?> persistenceXMLFile = resourceDirectory.getChildDirectory("META-INF").getChild("persistence.xml").reify(FileResource.class);
+        Node node = XMLParser.parse(persistenceXMLFile.getResourceInputStream());
+        Node persistenceUnitNode = node.getSingle("persistence-unit");
+        String provider = persistenceUnitNode.getSingle("provider").getText();
+        //if hibernate 4 or great then remove flush_before_completion property
+        if("org.hibernate.jpa.HibernatePersistenceProvider".equals(provider)) {
+        	 Node propertiesNode = persistenceUnitNode.getSingle("properties");
+        	 Optional<Node> flushProperty = propertiesNode.getChildren().stream()
+        	       .filter(p -> p.getAttribute("name").equals("hibernate.transaction.flush_before_completion"))
+        	       .findFirst();
+        	 
+        	 if(flushProperty.isPresent()) {
+        		 persistenceUnitNode.removeChild("properties");
+        		 Node newPropertiesNode = persistenceUnitNode.createChild("properties");
+        		 propertiesNode.getChildren().stream()
+        		 .filter(p -> !p.getAttribute("name").equals("hibernate.transaction.flush_before_completion"))
+                 .forEach(c -> newPropertiesNode.createChild("property")
+                      .attribute("name", c.getAttribute("name"))
+                      .attribute("value", c.getAttribute("value")));
+        		 persistenceXMLFile.setContents(XMLParser.toXMLInputStream(node));
+        	 }
+        	 
+        }
+       
+
+	}
+
+	/**
      * Just adds global scaffold config file to the project
      *
      * @param project

src/main/java/com/github/adminfaces/addon/util/AdminScaffoldUtils.java

@@ -1,8 +1,5 @@
 package com.github.adminfaces.addon.util;
 
-import com.github.adminfaces.addon.scaffold.metamodel.AdminFacesMetaModelProvider;
-import com.github.adminfaces.addon.scaffold.model.ScaffoldEntity;
-
 import static com.github.adminfaces.addon.util.DependencyUtil.ADMIN_PERSISTENCE_COORDINATE;
 
 import java.io.File;
@@ -15,13 +12,12 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
-import javax.persistence.Embeddable;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Id;
-
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
@@ -35,7 +31,6 @@
 import org.jboss.forge.addon.dependencies.builder.CoordinateBuilder;
 import org.jboss.forge.addon.dependencies.builder.DependencyBuilder;
 import org.jboss.forge.addon.facets.FacetFactory;
-import org.jboss.forge.addon.javaee.cdi.CDIFacet;
 import org.jboss.forge.addon.javaee.jpa.PersistenceMetaModelFacet;
 import org.jboss.forge.addon.maven.projects.MavenFacet;
 import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
@@ -47,7 +42,6 @@
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.Resource;
-
 import org.jboss.forge.addon.scaffold.util.ScaffoldUtil;
 import org.jboss.forge.parser.xml.Node;
 import org.jboss.forge.parser.xml.XMLParser;
@@ -58,6 +52,8 @@
 import org.jboss.forge.roaster.model.source.JavaClassSource;
 import org.jboss.forge.roaster.model.source.JavaSource;
 
+import com.github.adminfaces.addon.scaffold.metamodel.AdminFacesMetaModelProvider;
+
 /**
  * Created by pestano on 20/09/15.
  */

src/test/java/com/github/adminfaces/addon/AdminFacesForgeTests.java

@@ -125,7 +125,7 @@ public void setup() throws IllegalArgumentException, NoSuchFieldException, NoSuc
 
     @Test
     public void shouldSetupAdminFaces() throws Exception {
-        shellTest.execute("jpa-setup --provider Hibernate --container JBOSS_EAP7 --db-type H2 --data-source-name java:jboss/datasources/ExampleDS", 30, TimeUnit.SECONDS);
+        shellTest.execute("jpa-setup --jpa-provider \"Hibernate 4.x\" --container WILDFLY --db-type H2 --data-source-name java:jboss/datasources/ExampleDS", 30, TimeUnit.SECONDS);
         shellTest.clearScreen();
         Result result = shellTest.execute("adminfaces-setup", 60, TimeUnit.SECONDS);