diff --git a/src/main/java/com/github/vspiewak/loggenerator/Utils.java b/src/main/java/com/github/vspiewak/loggenerator/Utils.java index 84539fe..562c178 100644 --- a/src/main/java/com/github/vspiewak/loggenerator/Utils.java +++ b/src/main/java/com/github/vspiewak/loggenerator/Utils.java @@ -11,7 +11,7 @@ import java.util.Scanner; public class Utils { - private static final String LOG_SEPARATOR = " - "; + private static final String LOG_SEPARATOR = ","; private static final Logger log = LoggerFactory.getLogger(Utils.class); private static final List ips = new ArrayList(); private static final List products = new ArrayList(); @@ -54,16 +54,20 @@ public class Utils { String sex = "M"; if (id % 3 == 0) sex = "F"; return new StringBuilder() - .append("client").append((id%1000)+1).append("@gmail.com") + .append("email=") + .append("client").append((id % 1000) + 1).append("@gmail.com") .append(LOG_SEPARATOR) + .append("sex=") .append(sex) .toString(); } public static String getRandomSell(long id) { return new StringBuilder() + .append("id=") .append(id) .append(LOG_SEPARATOR) + .append("ip=") .append(getRandomIP()) .append(LOG_SEPARATOR) .append(getRandomClient(id)) @@ -74,25 +78,31 @@ public class Utils { public static String getRandomSearch(long id) { StringBuilder sb = new StringBuilder() + .append("id=") .append(id) .append(LOG_SEPARATOR) + .append("ip=") .append(getRandomIP()) .append(LOG_SEPARATOR) + .append("cat=") .append(getRandomFromArray(categories.values())); - sb.append(LOG_SEPARATOR); if (id % 4 == 0) { - sb.append(getRandomFromArray(matierials.values())); + sb.append(LOG_SEPARATOR) + .append("mat=") + .append(getRandomFromArray(matierials.values())); } - sb.append(LOG_SEPARATOR); if (id % 3 == 0) { - sb.append(getRandomFromArray(colors.values())); + sb.append(LOG_SEPARATOR) + .append("color=") + .append(getRandomFromArray(colors.values())); } - sb.append(LOG_SEPARATOR); if (id % 2 == 0) { - sb.append(getRandomFromArray(sizes.values())); + sb.append(LOG_SEPARATOR) + .append("size=") + .append(getRandomFromArray(sizes.values())); } return sb.toString(); @@ -101,28 +111,33 @@ public class Utils { private static void initProducts(int n) { for (int i = 0; i < n; i++) { StringBuilder sb = new StringBuilder() - .append("ref:" + (i + 1)) + .append("ref=" + (i + 1)) .append(LOG_SEPARATOR) + .append("cat=") .append(getRandomFromArray(categories.values())) .append(LOG_SEPARATOR) + .append("mat=") .append(getRandomFromArray(matierials.values())) .append(LOG_SEPARATOR) + .append("color=") .append(getRandomFromArray(colors.values())) .append(LOG_SEPARATOR) + .append("size=") .append(getRandomFromArray(sizes.values())) .append(LOG_SEPARATOR) + .append("price=") .append(getRandomPrice()); products.add(sb.toString()); } } - private enum sizes { XS, S, M, L, XL } + private enum sizes {XS, S, M, L, XL} - private enum colors { BLANC, NOIR, BLEU, VERT, ROSE, MARRON } + private enum colors {BLANC, NOIR, BLEU, VERT, ROSE, MARRON} - private enum categories { TSHIRT, DEBARDEUR, PULL, BOXER, CALCON, SLIP } + private enum categories {TSHIRT, DEBARDEUR, PULL, BOXER, CALCON, SLIP} - private enum matierials { COTON, SOIE, SYNTHETIQUE } + private enum matierials {COTON, SOIE, SYNTHETIQUE} static { readFromFile("ips.txt", ips); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 20f7a98..13d97d2 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -4,7 +4,7 @@ - %d{dd-MM-yyyy HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + %d{dd-MM-yyyy HH:mm:ss.SSS} [%thread] %level %logger - %msg%n