diff --git a/pom.xml b/pom.xml
index ff3669b..8726320 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,14 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 17
+ 17
+
+
diff --git a/src/main/java/com/release11/Main.java b/src/main/java/com/release11/Main.java
index 1a61c72..99ed9fb 100644
--- a/src/main/java/com/release11/Main.java
+++ b/src/main/java/com/release11/Main.java
@@ -60,7 +60,7 @@ public class Main {
from("activemq:queue:RawMaterial")
.enrich("direct:getPackages", new MyAggregator())
.marshal(xmlDataFormat)
- .to("activemq:queue:materialPackage")
+ .to("activemq:queue:MaterialPackage")
.to("log:?level=INFO&showBody=true");
}
diff --git a/src/main/java/com/release11/MyAggregator.java b/src/main/java/com/release11/MyAggregator.java
index 6ebbb84..dcd62c6 100644
--- a/src/main/java/com/release11/MyAggregator.java
+++ b/src/main/java/com/release11/MyAggregator.java
@@ -8,6 +8,8 @@ import org.apache.camel.Exchange;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class MyAggregator implements AggregationStrategy {
@Override
@@ -35,8 +37,23 @@ public class MyAggregator implements AggregationStrategy {
p.setDimension((String) newEx.get(i).get("dimension"));
p.setDescription((String) newEx.get(i).get("description"));
material.getPackages().add(p);
+
+ //validation
+ Pattern pattern = Pattern.compile("\\d\\dx\\d\\dx\\d\\d");
+ Matcher matcher = pattern.matcher(p.getDimension());
+ if(matcher.matches()){
+ System.out.println("maczuje");
+ }
+ else{
+ System.out.println("nieeeeeeeee");
+ }
}
+
+
+
+
+
Exchange result = oldExchange;
result.getIn().setBody(material);
return result;
diff --git a/target/Camel-1.0-SNAPSHOT.jar b/target/Camel-1.0-SNAPSHOT.jar
deleted file mode 100644
index 1d052b9..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_default-cli.xjb
similarity index 95%
rename from target/classes/META-INF/JAXB/episode_xsd-to-java.xjb
rename to target/classes/META-INF/JAXB/episode_default-cli.xjb
index 7d887f9..60aa725 100644
--- a/target/classes/META-INF/JAXB/episode_xsd-to-java.xjb
+++ b/target/classes/META-INF/JAXB/episode_default-cli.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 01:43:47 PM CET
+Generated on: 2021.11.18 at 02:34:17 PM CET
-->
diff --git a/target/classes/com/release11/DAO.class b/target/classes/com/release11/DAO.class
index 677603c..fae50b6 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.class b/target/classes/com/release11/Main$1.class
index a0c7940..70863a2 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 32b5af5..dd40f39 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 1524790..73cb52b 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
index 3bbd5b8..2e2e438 100644
Binary files a/target/classes/com/release11/MyBuilder$enumType.class and b/target/classes/com/release11/MyBuilder$enumType.class differ
diff --git a/target/classes/com/release11/MyBuilder.class b/target/classes/com/release11/MyBuilder.class
index 9907073..b7f2779 100644
Binary files a/target/classes/com/release11/MyBuilder.class and b/target/classes/com/release11/MyBuilder.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_default-cli.xjb
similarity index 95%
rename from target/generated-sources/jaxb/META-INF/JAXB/episode_xsd-to-java.xjb
rename to target/generated-sources/jaxb/META-INF/JAXB/episode_default-cli.xjb
index 7d887f9..60aa725 100644
--- a/target/generated-sources/jaxb/META-INF/JAXB/episode_xsd-to-java.xjb
+++ b/target/generated-sources/jaxb/META-INF/JAXB/episode_default-cli.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 01:43:47 PM CET
+Generated on: 2021.11.18 at 02:34:17 PM CET
-->
diff --git a/target/generated-sources/jaxb/generated/MaterialType.java b/target/generated-sources/jaxb/generated/MaterialType.java
index ec68351..a052fcc 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 01:43:47 PM CET
+// Generated on: 2021.11.18 at 02:34:17 PM CET
//
diff --git a/target/generated-sources/jaxb/generated/MaterialTypeType.java b/target/generated-sources/jaxb/generated/MaterialTypeType.java
index b841b9e..0351e9f 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 01:43:47 PM CET
+// Generated on: 2021.11.18 at 02:34:17 PM CET
//
diff --git a/target/generated-sources/jaxb/generated/ObjectFactory.java b/target/generated-sources/jaxb/generated/ObjectFactory.java
index 1603f96..7ec9a7b 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 01:43:47 PM CET
+// Generated on: 2021.11.18 at 02:34:17 PM CET
//
diff --git a/target/generated-sources/jaxb/generated/Package.java b/target/generated-sources/jaxb/generated/Package.java
index 3c579ea..c207ff4 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 01:43:47 PM CET
+// Generated on: 2021.11.18 at 02:34:17 PM CET
//
diff --git a/target/jaxb2/.xsd-to-java-xjcStaleFlag b/target/jaxb2/.xsd-to-java-xjcStaleFlag
deleted file mode 100644
index e69de29..0000000
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
deleted file mode 100644
index 596fd0d..0000000
--- a/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Nov 18 13:46:31 CET 2021
-groupId=org.example
-artifactId=Camel
-version=1.0-SNAPSHOT
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst
deleted file mode 100644
index e69de29..0000000
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
deleted file mode 100644
index 3caa486..0000000
--- a/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-/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/MyBuilder.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
deleted file mode 100644
index e69de29..0000000
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
deleted file mode 100644
index 4b4e0f2..0000000
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-/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/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
-/home/igor/Documents/Jacek/jacek-and-igor/src/main/java/com/release11/Main.java
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29..0000000