+ // substitute extra field name/value with extra fields tag
+ Iterator<Entry<Tag, String>> iterator = inputs.iterator();
+ boolean addExtraFields = false;
+ while (iterator.hasNext()) {
+ Entry<Tag, String> entry = iterator.next();
+ if (entry.getKey().equals(Tag.EXTRA_FIELD_NAME) ||
+ entry.getKey().equals(Tag.EXTRA_FIELD_VALUE)) {
+ iterator.remove();
+ addExtraFields = true;
+ }
+ }
+ if (addExtraFields) {
+ inputs.add(new SimpleEntry<>(Tag.EXTRA_FIELDS, Tag.EXTRA_FIELDS.toString()));
+ }
+