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

code/moya-angular/package.json

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

code/moya-angular/pom.xml

@@ -27,36 +27,33 @@
         <executions>
         <executions>
 
 
           <execution>
           <execution>
-          <!-- optional: you don't really need execution ids,
-          but it looks nice in your build log. -->
-          <id>install node and npm</id>
-          <goals>
-            <goal>install-node-and-npm</goal>
-          </goals>
-          <configuration>
-            <nodeVersion>${js.node.version}</nodeVersion>
-            <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>
-            <goal>npm</goal>
-          </goals>
-          <phase>generate-resources</phase>
-          <configuration>
-            <arguments>run build</arguments>
-          </configuration>
-        </execution>
-
+            <!-- optional: you don't really need execution ids,
+            but it looks nice in your build log. -->
+            <id>install node and npm</id>
+            <goals>
+              <goal>install-node-and-npm</goal>
+            </goals>
+            <configuration>
+              <nodeVersion>${js.node.version}</nodeVersion>
+              <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>
+              <goal>npm</goal>
+            </goals>
+            <phase>generate-resources</phase>
+            <configuration>
+              <arguments>run test-n-build</arguments>
+            </configuration>
+          </execution>
         </executions>
         </executions>
       </plugin>
       </plugin>
     </plugins>
     </plugins>

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;
 	}
 	}
 
 
 }
 }