Merge remote-tracking branch 'origin/master' into feature/folderStructure

code/moya-angular/package.json

@@ -10,6 +10,7 @@
     "aot": "ng build --aot",
     "test": "ng test",
     "lint": "ng lint",
+    "test-n-build": "ng lint && ng test && ng build",
     "e2e": "ng e2e",
     "version": "ng version"
   },

code/moya-angular/pom.xml

@@ -38,14 +38,12 @@
               <npmVersion>${js.npm.version}</npmVersion>
             </configuration>
           </execution>
-
           <execution>
             <id>npm install</id>
             <goals>
               <goal>npm</goal>
             </goals>
           </execution>
-
           <execution>
             <id>npm run build</id>
             <goals>
@@ -53,10 +51,9 @@
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-            <arguments>run build</arguments>
+              <arguments>run test-n-build</arguments>
             </configuration>
           </execution>
-
         </executions>
       </plugin>
     </plugins>

code/moya-beans/ejbModule/fi/codecrew/moya/facade/MenuitemFacade.java

@@ -41,9 +41,28 @@ public class MenuitemFacade extends IntegerPkGenericFacade<Menuitem> {
 		super(Menuitem.class);
 	}
 
-
 	public Menuitem findOrCreate(String url) {
-		return findOrCreate(url);
+		if (url == null || url.isEmpty()) {
+			return null;
+		}
+
+		try {
+			CriteriaBuilder cb = getEm().getCriteriaBuilder();
+			CriteriaQuery<Menuitem> cq = cb.createQuery(Menuitem.class);
+			Root<Menuitem> root = cq.from(Menuitem.class);
+			cq.where(cb.equal(root.get(Menuitem_.url), url));
+			Menuitem ret = super.getSingleNullableResult(getEm()
+					.createQuery(cq));
+			if (ret == null) {
+				ret = new Menuitem();
+				ret.setUrl(url);
+				create(ret);
+			}
+			return ret;
+		} catch (Exception e) {
+			logger.warn("Exception menussa" + url, e);
+		}
+		return null;
 	}
 
 }