You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2022/11/02 16:02:39 UTC
[GitHub] [nifi] tpalfy opened a new pull request, #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
tpalfy opened a new pull request, #6611:
URL: https://github.com/apache/nifi/pull/6611
<!-- 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. -->
# Summary
[NIFI-10722](https://issues.apache.org/jira/browse/NIFI-10722)
# Tracking
Please complete the following tracking steps prior to pull request creation.
### Issue Tracking
- [ ] [Apache NiFi Jira](https://issues.apache.org/jira/browse/NIFI) issue created
### Pull Request Tracking
- [ ] Pull Request title starts with Apache NiFi Jira issue number, such as `NIFI-00000`
- [ ] Pull Request commit message starts with Apache NiFi Jira issue number, as such `NIFI-00000`
### Pull Request Formatting
- [ ] Pull Request based on current revision of the `main` branch
- [ ] Pull Request refers to a feature branch with one commit containing changes
# Verification
Please indicate the verification steps performed prior to pull request creation.
### Build
- [ ] Build completed using `mvn clean install -P contrib-check`
- [ ] JDK 8
- [ ] JDK 11
- [ ] JDK 17
### Licensing
- [ ] New dependencies are compatible with the [Apache License 2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License Policy](https://www.apache.org/legal/resolved.html)
- [ ] New dependencies are documented in applicable `LICENSE` and `NOTICE` files
### Documentation
- [ ] Documentation formatting appears as expected in rendered files
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] tpalfy commented on a diff in pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
tpalfy commented on code in PR #6611:
URL: https://github.com/apache/nifi/pull/6611#discussion_r1018933121
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
+ invalidFiller(octetIndex, octet);
+ } else if (digit1 > 15) {
+ invalidInteger(digit1);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit1]);
+ }
+
+ if (digit2 == 15) {
+ if (octetIndex != size - 1) {
+ invalidFiller(octetIndex, octet);
+ }
+ } else if (digit2 > 15) {
+ invalidInteger(digit2);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit2]);
+ }
+ }
+
+ return resultBuilder.toString();
+ }
+
+ private boolean isTbcdString(Class<?> berType) {
+ Class<?> currentType = berType;
+ while (currentType != null) {
+ if (currentType.getSimpleName().equals(TBCD_STRING_TYPE)) {
+ return true;
+ }
+
+ currentType = currentType.getSuperclass();
+ }
+
+ return false;
+ }
+
+ private void invalidFiller(int octetIndex, int octet) {
+ throw new NumberFormatException("Illegal filler in octet nr. " + octetIndex + ": " + octet);
Review Comment:
Curiously, I think the original notation is actually less ambiguous.
The term `octet number [15]` could easily be interpreted as an expression that states an octet _value_ was found to be 15 and was considered to be illegal (`number` having the ambiguous meaning here).
`octet nr. 15` implies better that we are talking about the 15th octet.
I understand that after that we write the value as well, so really it would look something like this: `octet number [15] 22` but it would still be very confusing in my opinion.
The original in turn would look like `octet nr. 15: 22`.
I can add quotations or brackets around the _value_ like this: `octet nr. 15: '22'` or this: `octet nr. 15: [22]` but not convinced it would be actually better. I would add them for strings but for numbers I think we are better off without them.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory closed pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
exceptionfactory closed pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
URL: https://github.com/apache/nifi/pull/6611
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a diff in pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on code in PR #6611:
URL: https://github.com/apache/nifi/pull/6611#discussion_r1019136269
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
+ invalidFiller(octetIndex, octet);
+ } else if (digit1 > 15) {
+ invalidInteger(digit1);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit1]);
+ }
+
+ if (digit2 == 15) {
+ if (octetIndex != size - 1) {
+ invalidFiller(octetIndex, octet);
+ }
+ } else if (digit2 > 15) {
+ invalidInteger(digit2);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit2]);
+ }
+ }
+
+ return resultBuilder.toString();
+ }
+
+ private boolean isTbcdString(Class<?> berType) {
+ Class<?> currentType = berType;
+ while (currentType != null) {
+ if (currentType.getSimpleName().equals(TBCD_STRING_TYPE)) {
+ return true;
+ }
+
+ currentType = currentType.getSuperclass();
+ }
+
+ return false;
+ }
+
+ private void invalidFiller(int octetIndex, int octet) {
+ throw new NumberFormatException("Illegal filler in octet nr. " + octetIndex + ": " + octet);
Review Comment:
Thanks for the reply and additional background. I'm not too concerned about the formatting, just the use of `nr.` does not seem as clear as it could be. What about `octet index`? Or perhaps just dropping it altogether and using something like: `octet 22: 15` or `octet 22: value 15`. Just looking to avoid the use of `nr.` for clarity.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] tpalfy commented on a diff in pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
tpalfy commented on code in PR #6611:
URL: https://github.com/apache/nifi/pull/6611#discussion_r1018923823
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
Review Comment:
Hmm, it's a bit confusing. But the point here is not that this is the max value, but that it's specifically 15, which is a "filler" value (if I understand correctly).
I can add such a constant.
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
+ invalidFiller(octetIndex, octet);
+ } else if (digit1 > 15) {
+ invalidInteger(digit1);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit1]);
+ }
+
+ if (digit2 == 15) {
+ if (octetIndex != size - 1) {
+ invalidFiller(octetIndex, octet);
+ }
+ } else if (digit2 > 15) {
+ invalidInteger(digit2);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit2]);
+ }
+ }
+
+ return resultBuilder.toString();
+ }
+
+ private boolean isTbcdString(Class<?> berType) {
+ Class<?> currentType = berType;
+ while (currentType != null) {
+ if (currentType.getSimpleName().equals(TBCD_STRING_TYPE)) {
+ return true;
+ }
+
+ currentType = currentType.getSuperclass();
+ }
+
+ return false;
+ }
+
+ private void invalidFiller(int octetIndex, int octet) {
+ throw new NumberFormatException("Illegal filler in octet nr. " + octetIndex + ": " + octet);
Review Comment:
Curiously, I think the original notation is actually less ambiguous.
The term `octet number [15]` could easily be interpreted as an expression that states an octet _value_ was found to be 15 and was considered to be illegal (`number` having the ambiguous meaning here).
`octet nr. 15` implies better that we are talking about the 15th octet.
I understand that after that we write the value as well, so really it would look something like this: `octet number [15] 12` but it would still be very confusing in my opinion.
The original in turn would look like `octet nr. 15: 12`.
I can add quotations or brackets around the _value_ like this: `octet nr. 15: '12'` or this: `octet nr. 15: [12]` but not convinced it would be actually better. I would add them for strings but for numbers I think we are better off without them.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a diff in pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on code in PR #6611:
URL: https://github.com/apache/nifi/pull/6611#discussion_r1019130789
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
Review Comment:
Thanks, for the reply, I was also unsure of what to call the constant, so I'm open to what makes sense. Perhaps `FILLER_DECIMAL_CODE`?
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
Review Comment:
Thanks for the reply, I was also unsure of what to call the constant, so I'm open to what makes sense. Perhaps `FILLER_DECIMAL_CODE`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] tpalfy commented on a diff in pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
tpalfy commented on code in PR #6611:
URL: https://github.com/apache/nifi/pull/6611#discussion_r1018933121
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
+ invalidFiller(octetIndex, octet);
+ } else if (digit1 > 15) {
+ invalidInteger(digit1);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit1]);
+ }
+
+ if (digit2 == 15) {
+ if (octetIndex != size - 1) {
+ invalidFiller(octetIndex, octet);
+ }
+ } else if (digit2 > 15) {
+ invalidInteger(digit2);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit2]);
+ }
+ }
+
+ return resultBuilder.toString();
+ }
+
+ private boolean isTbcdString(Class<?> berType) {
+ Class<?> currentType = berType;
+ while (currentType != null) {
+ if (currentType.getSimpleName().equals(TBCD_STRING_TYPE)) {
+ return true;
+ }
+
+ currentType = currentType.getSuperclass();
+ }
+
+ return false;
+ }
+
+ private void invalidFiller(int octetIndex, int octet) {
+ throw new NumberFormatException("Illegal filler in octet nr. " + octetIndex + ": " + octet);
Review Comment:
Curiously, I think the original notation is actually less ambiguous.
The term `octet number [22]` could easily be interpreted as an expression that states an octet _value_ was found to be 22 and was considered to be illegal (`number` having the ambiguous meaning here).
`octet nr. 22` implies better that we are talking about the 15th octet.
I understand that after that we write the value as well, so really it would look something like this: `octet number [22] 15` but it would still be very confusing in my opinion.
The original in turn would look like `octet nr. 22: 15`.
I can add quotations or brackets around the _value_ like this: `octet nr. 22: '15'` or this: `octet nr. 22: [15]` but not convinced it would be actually better. I would add them for strings but for numbers I think we are better off without them.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a diff in pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on code in PR #6611:
URL: https://github.com/apache/nifi/pull/6611#discussion_r1018390500
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
Review Comment:
It would be helpful to define a `private static final` value for `15`, perhaps named something `MAXIMUM_DECIMAL_CODE`?
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
+ invalidFiller(octetIndex, octet);
+ } else if (digit1 > 15) {
+ invalidInteger(digit1);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit1]);
+ }
+
+ if (digit2 == 15) {
+ if (octetIndex != size - 1) {
+ invalidFiller(octetIndex, octet);
+ }
+ } else if (digit2 > 15) {
+ invalidInteger(digit2);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit2]);
+ }
+ }
+
+ return resultBuilder.toString();
+ }
+
+ private boolean isTbcdString(Class<?> berType) {
+ Class<?> currentType = berType;
+ while (currentType != null) {
+ if (currentType.getSimpleName().equals(TBCD_STRING_TYPE)) {
+ return true;
+ }
+
+ currentType = currentType.getSuperclass();
+ }
+
+ return false;
+ }
+
+ private void invalidFiller(int octetIndex, int octet) {
+ throw new NumberFormatException("Illegal filler in octet nr. " + octetIndex + ": " + octet);
Review Comment:
Recommend spelling out the message:
```suggestion
throw new NumberFormatException("Illegal filler in octet number [" + octetIndex + "] " + octet);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] tpalfy commented on a diff in pull request #6611: NIFI-10722 - Add handling of TBCD-STRING in nifi-asn1-services
Posted by GitBox <gi...@apache.org>.
tpalfy commented on code in PR #6611:
URL: https://github.com/apache/nifi/pull/6611#discussion_r1022966106
##########
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/TbcdStringConverter.java:
##########
@@ -0,0 +1,110 @@
+/*
+ * 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.nifi.jasn1.convert.converters;
+
+import com.beanit.asn1bean.ber.types.BerOctetString;
+import com.beanit.asn1bean.ber.types.BerType;
+import org.apache.nifi.jasn1.convert.JASN1Converter;
+import org.apache.nifi.jasn1.convert.JASN1TypeAndValueConverter;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordFieldType;
+
+public class TbcdStringConverter implements JASN1TypeAndValueConverter {
+
+ private static final String TBCD_STRING_TYPE = "TBCDSTRING";
+ private static final char[] TBCD_SYMBOLS = "0123456789*#abc".toCharArray();
+
+ @Override
+ public boolean supportsType(Class<?> berType) {
+ boolean supportsType = BerOctetString.class.isAssignableFrom(berType) && isTbcdString(berType);
+
+ return supportsType;
+ }
+
+ @Override
+ public DataType convertType(Class<?> berType, JASN1Converter converter) {
+ DataType dataType = RecordFieldType.STRING.getDataType();
+
+ return dataType;
+ }
+
+ @Override
+ public boolean supportsValue(BerType value, DataType dataType) {
+ boolean supportsValue = value instanceof BerOctetString && isTbcdString(value.getClass());
+
+ return supportsValue;
+ }
+
+ @Override
+ public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
+ final BerOctetString berValue = ((BerOctetString) value);
+
+ byte[] bytes = berValue.value;
+
+ int size = (bytes == null ? 0 : bytes.length);
+ StringBuilder resultBuilder = new StringBuilder(2 * size);
+
+ for (int octetIndex = 0; octetIndex < size; ++octetIndex) {
+ int octet = bytes[octetIndex];
+
+ int digit2 = (octet >> 4) & 0xF;
+ int digit1 = octet & 0xF;
+
+ if (digit1 == 15) {
+ invalidFiller(octetIndex, octet);
+ } else if (digit1 > 15) {
+ invalidInteger(digit1);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit1]);
+ }
+
+ if (digit2 == 15) {
+ if (octetIndex != size - 1) {
+ invalidFiller(octetIndex, octet);
+ }
+ } else if (digit2 > 15) {
+ invalidInteger(digit2);
+ } else {
+ resultBuilder.append(TBCD_SYMBOLS[digit2]);
+ }
+ }
+
+ return resultBuilder.toString();
+ }
+
+ private boolean isTbcdString(Class<?> berType) {
+ Class<?> currentType = berType;
+ while (currentType != null) {
+ if (currentType.getSimpleName().equals(TBCD_STRING_TYPE)) {
+ return true;
+ }
+
+ currentType = currentType.getSuperclass();
+ }
+
+ return false;
+ }
+
+ private void invalidFiller(int octetIndex, int octet) {
+ throw new NumberFormatException("Illegal filler in octet nr. " + octetIndex + ": " + octet);
Review Comment:
I think "nr." is a fairly accepted term in such a context but I can remove it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org