Merge branch 'menufix' into 'master'

Revert MenuItemFacade changes, accidentally merged from angular branch

See merge request !404

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

@@ -41,9 +41,28 @@ public class MenuitemFacade extends IntegerPkGenericFacade<Menuitem> {
 		super(Menuitem.class);
 		super(Menuitem.class);
 	}
 	}
 
 
-
 	public Menuitem findOrCreate(String url) {
 	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;
 	}
 	}
 
 
 }
 }