You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/09/19 11:57:40 UTC
[camel] branch master updated: CAMEL-15535 Camel Barcode : Add
additional headers to the exchange such as orientation (#4253)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5187127 CAMEL-15535 Camel Barcode : Add additional headers to the exchange such as orientation (#4253)
5187127 is described below
commit 5187127eb2108ecba43bcec69c7145945401d2e2
Author: Chandrakant Hardahe <ch...@gmail.com>
AuthorDate: Sat Sep 19 17:27:19 2020 +0530
CAMEL-15535 Camel Barcode : Add additional headers to the exchange such as orientation (#4253)
Co-authored-by: Chandrakant Hardahe <ch...@chardahe.pnq.csb>
---
.../src/main/docs/barcode-dataformat.adoc | 9 ++
.../dataformat/barcode/BarcodeDataFormat.java | 6 ++
.../dataformat/barcode/BarcodeUnmarshalTest.java | 107 +++++++++++++++++++++
3 files changed, 122 insertions(+)
diff --git a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
index d6bdec3..0c5be06 100644
--- a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
+++ b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
@@ -132,7 +132,16 @@ the barcode data format as header variable:
|BarcodeFormat |String |Value of com.google.zxing.BarcodeFormat.
|=======================================================================
+If you'll paste the code 39 barcode that is rotated some degrees into the 'barcode_in' folder,
+You can find the ORIENTATION as header variable:
+[width="100%",cols="10%,10%,80%",options="header",]
+|=======================================================================
+
+|Name |Type |Description
+
+|ORIENTATION |Integer |rotate value in degrees .
+|=======================================================================
include::camel-spring-boot::page$barcode-starter.adoc[]
diff --git a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
index b0c4c92..158c2c1 100644
--- a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
+++ b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
@@ -226,6 +226,12 @@ public class BarcodeDataFormat extends ServiceSupport implements DataFormat, Dat
// write the found barcode format into the header
exchange.getOut().setHeader(Barcode.BARCODE_FORMAT, result.getBarcodeFormat());
+ if (result.getResultMetadata() != null) {
+ result.getResultMetadata().forEach((k, v) -> {
+ exchange.getOut().setHeader(k.toString(), v);
+ });
+ }
+
return result.getText();
}
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeUnmarshalTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeUnmarshalTest.java
new file mode 100644
index 0000000..a02612f
--- /dev/null
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeUnmarshalTest.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.barcode;
+
+import java.io.*;
+
+import javax.imageio.ImageIO;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.DataFormat;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class BarcodeUnmarshalTest extends BarcodeTestBase {
+
+ private static final Logger LOG = LoggerFactory.getLogger(BarcodeUnmarshalTest.class);
+
+ @BeforeEach
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ // clean directory
+ File directory = new File(PATH);
+ if (!directory.isDirectory() || !directory.exists()) {
+ LOG.error(String.format(
+ "cannot delete files from directory '%s', because path is not a directory, or it doesn't exist.", PATH));
+ } else {
+ LOG.info("deleting files from " + PATH + "...");
+ File[] files = directory.listFiles();
+ for (File file : files) {
+ LOG.info(String.format("deleting %s", file.getName()));
+ file.delete();
+ }
+ }
+ }
+
+ @Test
+ void testOrientation() throws Exception {
+
+ Exchange exchange = template.request("direct:code1", new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody(MSG);
+ }
+ });
+
+ assertEquals(180, exchange.getOut().getHeader("ORIENTATION"));
+
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+
+ DataFormat code1 = new BarcodeDataFormat(200, 200, BarcodeImageType.PNG, BarcodeFormat.CODE_39);
+
+ from("direct:code1")
+ .marshal(code1)
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ ByteArrayInputStream bis = new ByteArrayInputStream((byte[]) exchange.getIn().getBody());
+ BinaryBitmap bitmap = new BinaryBitmap(
+ new HybridBinarizer(new BufferedImageLuminanceSource(ImageIO.read(bis))));
+ BitMatrix blackMatrix = bitmap.getBlackMatrix();
+ blackMatrix.rotate180();
+ File file = new File(PATH + "/TestImage.png");
+ FileOutputStream outputStream = new FileOutputStream(file);
+ MatrixToImageWriter.writeToStream(blackMatrix, "png", outputStream);
+ exchange.getIn().setBody(file);
+ }
+ }).unmarshal(code1)
+ .to("log:OUT")
+ .to("mock:out");
+ }
+ };
+ }
+}