diff --git a/.idea/misc.xml b/.idea/misc.xml index 5372e92..e24323e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 66efed7..4a54fc3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ 1.0-SNAPSHOT - 17 - 17 + 11 + 11 @@ -109,8 +109,8 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 + 11 + 11 diff --git a/src/main/java/com/release11/Main.java b/src/main/java/com/release11/Main.java index 2e51e88..2ae2a6e 100644 --- a/src/main/java/com/release11/Main.java +++ b/src/main/java/com/release11/Main.java @@ -59,32 +59,48 @@ public class Main { from("activemq:queue:RawMaterial") .enrich("direct:getPackages", new MyAggregator()) + .process(new Processor(){ + + @Override + public void process(Exchange exchange) throws Exception { + MaterialType material = (MaterialType) exchange.getIn().getBody(); + + + + + + + } + }) + + .choice() - .when(simple("${header.ean} == 'false'")) - .marshal(xmlDataFormat) - .to("activemq:queue:BadEan") - .when(simple("${header.dimension} == 'false'")) - .marshal(xmlDataFormat) - .to("activemq:queue:BadDimension") - .otherwise() - .marshal(xmlDataFormat) - .to("activemq:queue:ValidMaterial") + .when(simple("${header.ean} == false")) + .marshal(xmlDataFormat) + .to("activemq:queue:BadEan") + .when(simple("${header.dimension} == false")) + .marshal(xmlDataFormat) + .to("activemq:queue:BadDimension") + .otherwise() + .marshal(xmlDataFormat) + .to("activemq:queue:ValidMaterial") .to("log:?level=INFO&showBody=true"); + /* from("activemq:queue:ValidMaterial") + .process(new MyProcess()) + .unmarshal(xmlDataFormat) .process(exchange -> { - + MaterialType material = (MaterialType) exchange.getIn().getBody(); + //MaterialTypeType type = material.getMaterialType(); + //exchange.getIn().setHeader("type", true); + //if (!(type.equals("A1") || type.equals("A2") || type.equals("A3"))) + // exchange.getIn().setHeader("type", false); + //if(exchange.getIn().getHeader("type").equals(true)) + System.out.println(material.toString()); + }); - - - - - - - - - - +*/ } }); diff --git a/src/main/java/com/release11/MyAggregator.java b/src/main/java/com/release11/MyAggregator.java index 6d1de14..b920cae 100644 --- a/src/main/java/com/release11/MyAggregator.java +++ b/src/main/java/com/release11/MyAggregator.java @@ -1,5 +1,6 @@ package com.release11; + import generated.MaterialType; import generated.MaterialTypeType; import generated.Package; @@ -28,8 +29,8 @@ public class MyAggregator implements AggregationStrategy { material.setIsDeleted((Boolean) oldEx.get("is_deleted")); - oldExchange.getIn().setHeader("dimension", "true"); - oldExchange.getIn().setHeader("ean", "true"); + oldExchange.getIn().setHeader("dimension", true); + oldExchange.getIn().setHeader("ean", true); for (int i = 0; i < newEx.size(); i++) { Package p = new Package(); @@ -46,9 +47,9 @@ public class MyAggregator implements AggregationStrategy { Pattern pattern = Pattern.compile("\\d\\dx\\d\\dx\\d\\d"); Matcher matcher = pattern.matcher(p.getDimension()); if (!matcher.matches()) - oldExchange.getIn().setHeader("dimension", "false"); + oldExchange.getIn().setHeader("dimension", false); if(!isEanGood(p.getEan())) - oldExchange.getIn().setHeader("ean", "false"); + oldExchange.getIn().setHeader("ean", false); } diff --git a/src/main/java/com/release11/MyBuilder.java b/src/main/java/com/release11/MyBuilder.java deleted file mode 100644 index 5088fdd..0000000 --- a/src/main/java/com/release11/MyBuilder.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.release11; - -import org.apache.camel.CamelContext; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.support.SimpleRegistry; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Random; - -public class MyBuilder extends RouteBuilder { - - //MyBuilder myBuilder = new MyBuilder(); - //context.addRoutes(myBuilder); - - @Override - public void configure() throws Exception { - from("timer:foo?fixedRate=true&period=400") - .log("Hello Camel"); - } - - public enum enumType { - A1, A2, A3, B1, B2, B3, Z1, Z2, Z3; - } - - public void doRandomMaterials() throws IOException { - - File fileName = new File("/home/igor/Documents/XML_Tasks/Camel/sql_script/sql.dml"); - - BufferedWriter writer = new BufferedWriter(new FileWriter(fileName)); - Random random = new Random(); - for (int i = 1; i <= 100; i++) { - String number = "number" + random.nextInt(1000, 10000); - String name = "name" + random.nextInt(1000, 10000); - String description = "description" + random.nextInt(1000, 10000); - String is_deleted = ""; - if (random.nextInt() % 2 == 0) - is_deleted = "true"; - else - is_deleted = "false"; - - enumType[] x = enumType.values(); - String type = x[random.nextInt(x.length)].toString(); - writer.write("INSERT INTO material VALUES(" + - i + ", '" + number + "', '" + type + "', '" + name + "', '" + description + "', " + is_deleted + ");\n"); - } - writer.close(); - - } - - public void doRandomPackage() throws IOException { - - File fileName = new File("/home/igor/Documents/XML_Tasks/Camel/sql_script/sql.dml"); - - BufferedWriter writer = new BufferedWriter(new FileWriter(fileName, true)); - Random random = new Random(); - for (int i = 1; i <= 100; i++) { - String number = "number" + random.nextInt(1000, 10000); - Integer material_id = i; - String ean = eanGenerator(); - String unit_of_measure = "unit" + random.nextInt(1000, 10000); - String dimension = random.nextInt(5, 35) + "x" + random.nextInt(5, 35) + "x" + random.nextInt(5, 35); - String description = "description" + random.nextInt(1000, 10000); - - writer.write("INSERT INTO package VALUES(" + - i + ", '" + number + "', '" + material_id + "', '" + ean + "', '" - + unit_of_measure + "', '" + dimension + "', '" + description + "');\n"); - } - - for (int i = 101; i <= 200; i++) { - String number = "number" + random.nextInt(1000, 10000); - Integer material_id = random.nextInt(1, 101); - String ean = eanGenerator(); - String unit_of_measure = "unit" + random.nextInt(1000, 10000); - String dimension = random.nextInt(5, 35) + "x" + random.nextInt(5, 35) + "x" + random.nextInt(5, 35); - String description = "description" + random.nextInt(1000, 10000); - - writer.write("INSERT INTO package VALUES(" + - i + ", '" + number + "', '" + material_id + "', '" + ean + "', '" - + unit_of_measure + "', '" + dimension + "', '" + description + "');\n"); - } - - - writer.close(); - - } - - public String eanGenerator() { - - String result = "590"; - Random random = new Random(); - while (result.length() < 12) { - result += random.nextInt(10); - } - - int sum = 0; - for (int i = 0; i < result.length(); i++) { - if (i % 2 == 1) - sum += (result.charAt(i) - '0') * 3; - else - sum += (int) result.charAt(i) - '0'; - } - - sum = sum - (sum / 10) * (10); - if (sum != 0) - sum = 10 - sum; - result += sum; - - return result; - } - -} diff --git a/src/main/java/com/release11/MyProcess.java b/src/main/java/com/release11/MyProcess.java new file mode 100644 index 0000000..a30104e --- /dev/null +++ b/src/main/java/com/release11/MyProcess.java @@ -0,0 +1,16 @@ +package com.release11; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +public class MyProcess implements Processor { + @Override + public void process(Exchange exchange) throws Exception { + System.out.println("SIEMAAAAAAAAAAA"); + String tmp = (String) exchange.getIn().getBody(); + System.out.println(tmp); + System.out.println("SIEMAAAAAAAAAAA"); + Thread.sleep(100000); + + } +} diff --git a/target/Camel-1.0-SNAPSHOT.jar b/target/Camel-1.0-SNAPSHOT.jar deleted file mode 100644 index 36cae29..0000000 Binary files a/target/Camel-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/target/classes/META-INF/JAXB/episode_xsd-to-java.xjb b/target/classes/META-INF/JAXB/episode_xsd-to-java.xjb index 740e985..d0e1cbd 100644 --- a/target/classes/META-INF/JAXB/episode_xsd-to-java.xjb +++ b/target/classes/META-INF/JAXB/episode_xsd-to-java.xjb @@ -5,7 +5,7 @@ This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.2 See https://javaee.github.io/jaxb-v2/ Any modifications to this file will be lost upon recompilation of the source schema. -Generated on: 2021.11.18 at 03:03:29 PM CET +Generated on: 2021.11.18 at 04:43:50 PM CET --> diff --git a/target/classes/com/release11/DAO.class b/target/classes/com/release11/DAO.class index fae50b6..677603c 100644 Binary files a/target/classes/com/release11/DAO.class and b/target/classes/com/release11/DAO.class differ diff --git a/target/classes/com/release11/Main$1$1.class b/target/classes/com/release11/Main$1$1.class new file mode 100644 index 0000000..800bf5a Binary files /dev/null and b/target/classes/com/release11/Main$1$1.class differ diff --git a/target/classes/com/release11/Main$1.class b/target/classes/com/release11/Main$1.class index b9082a2..5512a51 100644 Binary files a/target/classes/com/release11/Main$1.class and b/target/classes/com/release11/Main$1.class differ diff --git a/target/classes/com/release11/Main.class b/target/classes/com/release11/Main.class index 34448ac..e93c1a7 100644 Binary files a/target/classes/com/release11/Main.class and b/target/classes/com/release11/Main.class differ diff --git a/target/classes/com/release11/MyAggregator.class b/target/classes/com/release11/MyAggregator.class index 195af4e..07be920 100644 Binary files a/target/classes/com/release11/MyAggregator.class and b/target/classes/com/release11/MyAggregator.class differ diff --git a/target/classes/com/release11/MyBuilder$enumType.class b/target/classes/com/release11/MyBuilder$enumType.class deleted file mode 100644 index 2e2e438..0000000 Binary files a/target/classes/com/release11/MyBuilder$enumType.class and /dev/null differ diff --git a/target/classes/com/release11/MyBuilder.class b/target/classes/com/release11/MyBuilder.class deleted file mode 100644 index b7f2779..0000000 Binary files a/target/classes/com/release11/MyBuilder.class and /dev/null differ diff --git a/target/classes/com/release11/MyProcess.class b/target/classes/com/release11/MyProcess.class new file mode 100644 index 0000000..e72bcec Binary files /dev/null and b/target/classes/com/release11/MyProcess.class differ diff --git a/target/classes/generated/MaterialType.class b/target/classes/generated/MaterialType.class index d44b0ec..d1a3289 100644 Binary files a/target/classes/generated/MaterialType.class and b/target/classes/generated/MaterialType.class differ diff --git a/target/classes/generated/MaterialTypeType.class b/target/classes/generated/MaterialTypeType.class index f239fbe..37556ba 100644 Binary files a/target/classes/generated/MaterialTypeType.class and b/target/classes/generated/MaterialTypeType.class differ diff --git a/target/classes/generated/ObjectFactory.class b/target/classes/generated/ObjectFactory.class index 2abb3b1..31f828c 100644 Binary files a/target/classes/generated/ObjectFactory.class and b/target/classes/generated/ObjectFactory.class differ diff --git a/target/classes/generated/Package.class b/target/classes/generated/Package.class index 5d70fd7..656d9ed 100644 Binary files a/target/classes/generated/Package.class and b/target/classes/generated/Package.class differ diff --git a/target/generated-sources/jaxb/META-INF/JAXB/episode_xsd-to-java.xjb b/target/generated-sources/jaxb/META-INF/JAXB/episode_xsd-to-java.xjb index 740e985..d0e1cbd 100644 --- a/target/generated-sources/jaxb/META-INF/JAXB/episode_xsd-to-java.xjb +++ b/target/generated-sources/jaxb/META-INF/JAXB/episode_xsd-to-java.xjb @@ -5,7 +5,7 @@ This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.2 See https://javaee.github.io/jaxb-v2/ Any modifications to this file will be lost upon recompilation of the source schema. -Generated on: 2021.11.18 at 03:03:29 PM CET +Generated on: 2021.11.18 at 04:43:50 PM CET --> diff --git a/target/generated-sources/jaxb/generated/MaterialType.java b/target/generated-sources/jaxb/generated/MaterialType.java index 068fad1..6edb9de 100644 --- a/target/generated-sources/jaxb/generated/MaterialType.java +++ b/target/generated-sources/jaxb/generated/MaterialType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.2 // See https://javaee.github.io/jaxb-v2/ // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2021.11.18 at 03:03:29 PM CET +// Generated on: 2021.11.18 at 04:43:50 PM CET // diff --git a/target/generated-sources/jaxb/generated/MaterialTypeType.java b/target/generated-sources/jaxb/generated/MaterialTypeType.java index 18d6bc2..8636499 100644 --- a/target/generated-sources/jaxb/generated/MaterialTypeType.java +++ b/target/generated-sources/jaxb/generated/MaterialTypeType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.2 // See https://javaee.github.io/jaxb-v2/ // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2021.11.18 at 03:03:29 PM CET +// Generated on: 2021.11.18 at 04:43:50 PM CET // diff --git a/target/generated-sources/jaxb/generated/ObjectFactory.java b/target/generated-sources/jaxb/generated/ObjectFactory.java index 9f7c2a9..6b46e25 100644 --- a/target/generated-sources/jaxb/generated/ObjectFactory.java +++ b/target/generated-sources/jaxb/generated/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.2 // See https://javaee.github.io/jaxb-v2/ // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2021.11.18 at 03:03:29 PM CET +// Generated on: 2021.11.18 at 04:43:50 PM CET // diff --git a/target/generated-sources/jaxb/generated/Package.java b/target/generated-sources/jaxb/generated/Package.java index afa731a..63ba2e8 100644 --- a/target/generated-sources/jaxb/generated/Package.java +++ b/target/generated-sources/jaxb/generated/Package.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.2 // See https://javaee.github.io/jaxb-v2/ // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2021.11.18 at 03:03:29 PM CET +// Generated on: 2021.11.18 at 04:43:50 PM CET // diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index 105e95c..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Thu Nov 18 15:35:05 CET 2021 -groupId=org.example -artifactId=Camel -version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst similarity index 100% rename from target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst rename to target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst diff --git a/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst new file mode 100644 index 0000000..0aeaaff --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst @@ -0,0 +1,4 @@ +/home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/DAO.java +/home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/MyProcess.java +/home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/MyAggregator.java +/home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/Main.java diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index e69de29..3006cd6 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,10 @@ +com/release11/Main$1.class +com/release11/Main$1$1.class +generated/MaterialTypeType.class +com/release11/Main.class +com/release11/DAO.class +com/release11/MyProcess.class +generated/Package.class +com/release11/MyAggregator.class +generated/MaterialType.class +generated/ObjectFactory.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 4b4e0f2..da45fbb 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,7 +1,7 @@ /home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/DAO.java /home/igor/Documents/Jacek/jacek-and-igor/target/generated-sources/jaxb/generated/MaterialType.java /home/igor/Documents/Jacek/jacek-and-igor/target/generated-sources/jaxb/generated/Package.java -/home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/MyBuilder.java +/home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/MyProcess.java /home/igor/Documents/Jacek/jacek-and-igor/target/generated-sources/jaxb/generated/ObjectFactory.java /home/igor/Documents/Jacek/jacek-and-igor/target/generated-sources/jaxb/generated/MaterialTypeType.java /home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/MyAggregator.java