Update 1.3.0

JelteMX · JelteMX · commit 15ee91bc1015 · 2019-11-27T14:49:28.000+01:00
diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+[![Support](https://img.shields.io/badge/Support-Community%20(no%20active%20support)-orange.svg)](https://docs.mendix.com/developerportal/app-store/app-store-content-support)
+[![Studio](https://img.shields.io/badge/Studio%20version-8.0%2B-blue.svg)](https://appstore.home.mendix.com/link/modeler/)
+![GitHub release](https://img.shields.io/github/release/JelteMX/mendix-fake-data-module)
+![GitHub issues](https://img.shields.io/github/issues/JelteMX/mendix-fake-data-module)
+
 # Fake Data Module for Mendix
 
 ![Icon](/assets/FakeDataIcon.png)
@@ -6,6 +11,38 @@ Want to generate fake data in Mendix? The Fake Data Module for Mendix does this
 
 ![screenshot](/assets/FakeDataScreenshot1.png)
 
+## Java Actions
+
+### Dates
+
+- **GenerateDateBetween** - generate a date between two dates
+
+### Numbers
+
+- **GenerateDecimalBetween** - generate a decimal between two numbers
+- **GenerateNumberBetween** - generate an integer/long between two numbers
+- **GenerateNumberDigits** - generate an long number with an X amount of digits
+
+### Objects
+
+The following Entities can be created:
+
+ - App
+ - Artist
+ - Cat
+ - Commerce
+ - Name
+
+Please have a look at the Domain Model in the module for all attributes that are set.
+
+### Strings
+
+- **GenerateFakeString** - generate a string from a predefined list of types, like hashes, quotes
+- **GenerateQuote** - generate a string that holds a quote from one of the predefined movies/characters
+- **GenerateRandomColorHex** - generate a color in HEX format
+- **GenerateRandomRegexString** - generate a string based on a Regex. More information can be found here: [https://github.com/mifmif/Generex](https://github.com/mifmif/Generex)
+- **GenerateRandomString** - generate a string based on a mask. This mask will replace any `?` with a letter and any `#` with a number.
+
 ## Libraries used
 
 - Apache Commons Lang
diff --git a/dist/FakeData.mpk b/dist/FakeData.mpk
diff --git a/src/javasource/fakedata/actions/GenerateApp.java b/src/javasource/fakedata/actions/GenerateApp.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
@@ -27,7 +28,8 @@ public GenerateApp(IContext context)
 	public IMendixObject executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		com.github.javafaker.App app = faker.app();
 		
 		IMendixObject object = Core.instantiate(getContext(), App.getType());
diff --git a/src/javasource/fakedata/actions/GenerateArtist.java b/src/javasource/fakedata/actions/GenerateArtist.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
@@ -27,7 +28,8 @@ public GenerateArtist(IContext context)
 	public IMendixObject executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		com.github.javafaker.Artist artist = faker.artist();
 		
 		IMendixObject object = Core.instantiate(getContext(), Artist.getType());
diff --git a/src/javasource/fakedata/actions/GenerateCat.java b/src/javasource/fakedata/actions/GenerateCat.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
@@ -27,7 +28,8 @@ public GenerateCat(IContext context)
 	public IMendixObject executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		com.github.javafaker.Cat cat = faker.cat();
 		
 		IMendixObject object = Core.instantiate(getContext(), Cat.getType());
diff --git a/src/javasource/fakedata/actions/GenerateCommerce.java b/src/javasource/fakedata/actions/GenerateCommerce.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
@@ -34,7 +35,8 @@ public GenerateCommerce(IContext context, java.math.BigDecimal MinPrice, java.ma
 	public IMendixObject executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		com.github.javafaker.Commerce commerce = faker.commerce();
 		
 		IMendixObject object = Core.instantiate(getContext(), Commerce.getType());
diff --git a/src/javasource/fakedata/actions/GenerateCountry.java b/src/javasource/fakedata/actions/GenerateCountry.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
@@ -27,7 +28,8 @@ public GenerateCountry(IContext context)
 	public IMendixObject executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		com.github.javafaker.Country country = faker.country();
 		
 		IMendixObject object = Core.instantiate(getContext(), Country.getType());
diff --git a/src/javasource/fakedata/actions/GenerateDateBetween.java b/src/javasource/fakedata/actions/GenerateDateBetween.java
@@ -10,6 +10,7 @@
 package fakedata.actions;
 
 import java.util.Date;
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
@@ -30,7 +31,8 @@ public GenerateDateBetween(IContext context, java.util.Date BeginDate, java.util
 	public java.util.Date executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		Date dateBetween = faker.date().between(this.BeginDate, this.EndDate);
 		return dateBetween;
 		// END USER CODE
diff --git a/src/javasource/fakedata/actions/GenerateDecimalBetween.java b/src/javasource/fakedata/actions/GenerateDecimalBetween.java
@@ -10,6 +10,7 @@
 package fakedata.actions;
 
 import java.math.BigDecimal;
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
@@ -32,7 +33,8 @@ public GenerateDecimalBetween(IContext context, java.lang.Long Min, java.lang.Lo
 	public java.math.BigDecimal executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		
 		Long min = (this.Min > this.Max) ? this.Max : this.Min;
 		Long max = (this.Max < this.Min) ? this.Min : this.Max;
diff --git a/src/javasource/fakedata/actions/GenerateFakeString.java b/src/javasource/fakedata/actions/GenerateFakeString.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
@@ -31,7 +32,8 @@ public GenerateFakeString(IContext context, java.lang.String Parameter)
 	public java.lang.String executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		
 		if (this.Parameter == null) {
 			return "";
diff --git a/src/javasource/fakedata/actions/GenerateName.java b/src/javasource/fakedata/actions/GenerateName.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
@@ -27,7 +28,8 @@ public GenerateName(IContext context)
 	public IMendixObject executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		com.github.javafaker.Name name = faker.name();
 		
 		IMendixObject object = Core.instantiate(getContext(), Name.getType());
diff --git a/src/javasource/fakedata/actions/GenerateNumberBetween.java b/src/javasource/fakedata/actions/GenerateNumberBetween.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
@@ -29,7 +30,8 @@ public GenerateNumberBetween(IContext context, java.lang.Long Min, java.lang.Lon
 	public java.lang.Long executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		
 		Long min = (this.Min > this.Max) ? this.Max : this.Min;
 		Long max = (this.Max < this.Min) ? this.Min : this.Max;
diff --git a/src/javasource/fakedata/actions/GenerateNumberDigits.java b/src/javasource/fakedata/actions/GenerateNumberDigits.java
@@ -0,0 +1,51 @@
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package fakedata.actions;
+
+import java.util.Random;
+import com.github.javafaker.Faker;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+public class GenerateNumberDigits extends CustomJavaAction<java.lang.Long>
+{
+	private java.lang.Long NumberOfDigits;
+	private java.lang.Boolean Strict;
+
+	public GenerateNumberDigits(IContext context, java.lang.Long NumberOfDigits, java.lang.Boolean Strict)
+	{
+		super(context);
+		this.NumberOfDigits = NumberOfDigits;
+		this.Strict = Strict;
+	}
+
+	@java.lang.Override
+	public java.lang.Long executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
+		
+		return faker.number().randomNumber(this.NumberOfDigits.intValue(), this.Strict);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "GenerateNumberDigits";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/src/javasource/fakedata/actions/GenerateQuote.java b/src/javasource/fakedata/actions/GenerateQuote.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
@@ -28,7 +29,8 @@ public GenerateQuote(IContext context, java.lang.String Parameter)
 	public java.lang.String executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
 		
 		if (this.Parameter == null) {
 			return "";
diff --git a/src/javasource/fakedata/actions/GenerateRandomColorHex.java b/src/javasource/fakedata/actions/GenerateRandomColorHex.java
@@ -9,6 +9,7 @@
 
 package fakedata.actions;
 
+import java.util.Random;
 import com.github.javafaker.Faker;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
@@ -27,7 +28,9 @@ public GenerateRandomColorHex(IContext context, java.lang.Boolean HashSign)
 	public java.lang.String executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		Faker faker = new Faker();
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
+		
 		return faker.color().hex(this.HashSign).toString();
 		// END USER CODE
 	}
diff --git a/src/javasource/fakedata/actions/GenerateRandomStringFromFaker.java b/src/javasource/fakedata/actions/GenerateRandomStringFromFaker.java
@@ -0,0 +1,65 @@
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package fakedata.actions;
+
+import com.github.javafaker.Faker;
+import com.github.javafaker.service.FakeValuesService;
+import com.github.javafaker.service.RandomService;
+import com.mendix.systemwideinterfaces.core.IContext;
+import java.util.Locale;
+import java.util.Random;
+import com.mendix.webui.CustomJavaAction;
+
+public class GenerateRandomStringFromFaker extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String Locale;
+	private java.lang.String Expression;
+
+	public GenerateRandomStringFromFaker(IContext context, java.lang.String Locale, java.lang.String Expression)
+	{
+		super(context);
+		this.Locale = Locale;
+		this.Expression = Expression;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Locale locale = this.Locale != "" ? new Locale(this.Locale) : new Locale("en-US");
+		if (this.Expression == "") {
+			return "";
+		}
+		
+		Random random = new Random(this.getContext().getRequestStartTime());
+		Faker faker = new Faker(random);
+		FakeValuesService service = new FakeValuesService(locale, new RandomService(random));
+		
+		try {
+			return service.expression(this.Expression, faker);
+		} catch (Exception e) {
+			// TODO: handle exception
+			return "Unknown/wrong expression :: " + this.Expression;
+		}
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "GenerateRandomStringFromFaker";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/src/package.xml b/src/package.xml
diff --git a/src/project.mpr b/src/project.mpr
