remove "static" file name override

#7
metasfresh · Jan 7, 2020 · a611079 · a611079
1 parent edf669b
commit a611079
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/de/metas/edi/esb/route/exports/StepComXMLDesadvRoute.java b/src/main/java/de/metas/edi/esb/route/exports/StepComXMLDesadvRoute.java
@@ -27,7 +27,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.converter.jaxb.JaxbDataFormat;
 import org.apache.camel.spi.DataFormat;
@@ -55,7 +54,7 @@ public class StepComXMLDesadvRoute extends AbstractEDIRoute
 {
 	public static final String ROUTE_ID = "MF-Desadv-To-STEPCOM-XML-Desadv";
 
-	private static final String EDI_DESADV_XML_FILENAME_PATTERN = "edi.file.desadv.stepcom-xml.filename";
+	//private static final String EDI_DESADV_XML_FILENAME_PATTERN = "edi.file.desadv.stepcom-xml.filename";
 
 	public static final String EP_EDI_STEPCOM_XML_DESADV_CONSUMER = "direct:edi.xml.desadv.consumer";
 
@@ -86,7 +85,7 @@ public void configureEDIRoute(@NonNull final DataFormat jaxb, @NonNull final Dec
 		final ReaderTypeConverter readerTypeConverter = new ReaderTypeConverter();
 		getContext().getTypeConverterRegistry().addTypeConverters(readerTypeConverter);
 
-		final String desadvFilenamePattern = Util.resolveProperty(getContext(), StepComXMLDesadvRoute.EDI_DESADV_XML_FILENAME_PATTERN);
+		//final String desadvFilenamePattern = Util.resolveProperty(getContext(), StepComXMLDesadvRoute.EDI_DESADV_XML_FILENAME_PATTERN);
 
 		final String ownerId = Util.resolveProperty(getContext(), StepComXMLDesadvRoute.EDI_XML_OWNER_ID);
 		final String supplierGln = Util.resolveProperty(getContext(), StepComXMLDesadvRoute.EDI_XML_SUPPLIER_GLN);
@@ -131,7 +130,7 @@ public void configureEDIRoute(@NonNull final DataFormat jaxb, @NonNull final Dec
 				.marshal(dataFormat)
 
 				.log(LoggingLevel.INFO, "Setting output filename pattern from properties...")
-				.setHeader(Exchange.FILE_NAME).simple(desadvFilenamePattern)
+				//.setHeader(Exchange.FILE_NAME).simple(desadvFilenamePattern)
 
 				.log(LoggingLevel.INFO, "Sending STEPcom-XML to the endpoint(s):\r\n" + body())
 				.multicast()

diff --git a/src/main/java/de/metas/edi/esb/route/exports/StepComXMLInvoicRoute.java b/src/main/java/de/metas/edi/esb/route/exports/StepComXMLInvoicRoute.java
@@ -27,7 +27,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.converter.jaxb.JaxbDataFormat;
 import org.apache.camel.spi.DataFormat;
@@ -54,7 +53,7 @@ public class StepComXMLInvoicRoute extends AbstractEDIRoute
 {
 	public static final String ROUTE_ID = "MF-Invoic-To-STEPCOM-XML-Invoic";
 
-	private static final String EDI_STEPCOM_XML_INVOICE_FILENAME_PATTERN = "edi.file.invoic.stepcom-xml.filename";
+	//private static final String EDI_STEPCOM_XML_INVOICE_FILENAME_PATTERN = "edi.file.invoic.stepcom-xml.filename";
 
 	public static final String EP_EDI_STEPCOM_XML_INVOICE_CONSUMER = "direct:edi.invoic.stepcom-xml.consumer";
 
@@ -84,7 +83,7 @@ public void configureEDIRoute(final DataFormat jaxb, final DecimalFormat decimal
 		final ReaderTypeConverter readerTypeConverter = new ReaderTypeConverter();
 		getContext().getTypeConverterRegistry().addTypeConverters(readerTypeConverter);
 
-		final String invoiceXMLFilenamePattern = Util.resolveProperty(getContext(), EDI_STEPCOM_XML_INVOICE_FILENAME_PATTERN);
+		//final String invoiceXMLFilenamePattern = Util.resolveProperty(getContext(), EDI_STEPCOM_XML_INVOICE_FILENAME_PATTERN);
 
 		final String senderGln = Util.resolveProperty(getContext(), EDI_INVOICE_SENDER_GLN);
 		final String ownerId = Util.resolveProperty(getContext(), EDI_XML_OWNER_ID);
@@ -128,7 +127,7 @@ public void configureEDIRoute(final DataFormat jaxb, final DecimalFormat decimal
 				.marshal(dataFormat)
 
 				.log(LoggingLevel.INFO, "Setting output filename pattern from properties...")
-				.setHeader(Exchange.FILE_NAME).simple(invoiceXMLFilenamePattern)
+				//.setHeader(Exchange.FILE_NAME).simple(invoiceXMLFilenamePattern)
 
 				.log(LoggingLevel.INFO, "Sending STEPcom-XML to the endpoint(s):\r\n" + body())
 				.multicast().stopOnException().to(endPointURIs)