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/29 17:19:54 UTC
[GitHub] [nifi] tpalfy commented on a diff in pull request #6670: NIFI-10832: Create PutSalesforceObject processor
tpalfy commented on code in PR #6670:
URL: https://github.com/apache/nifi/pull/6670#discussion_r1035006046
##########
nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/util/RecordExtender.java:
##########
@@ -0,0 +1,90 @@
+/*
+ * 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.processors.salesforce.util;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.MapRecord;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordField;
+import org.apache.nifi.serialization.record.RecordFieldType;
+import org.apache.nifi.serialization.record.RecordSchema;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class RecordExtender {
+
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
+ static final SimpleRecordSchema ATTRIBUTES_RECORD_SCHEMA = new SimpleRecordSchema(Arrays.asList(
+ new RecordField("type", RecordFieldType.STRING.getDataType()),
+ new RecordField("referenceId", RecordFieldType.STRING.getDataType())
+ ));
+
+ private final RecordSchema extendedSchema;
+
+ public RecordExtender(final RecordSchema originalSchema) {
+ extendedSchema = getExtendedSchema(originalSchema);
Review Comment:
```suggestion
List<RecordField> recordFields = new ArrayList<>(originalSchema.getFields());
recordFields.add(new RecordField("attributes", RecordFieldType.RECORD.getRecordDataType(
ATTRIBUTES_RECORD_SCHEMA
)));
extendedSchema = new SimpleRecordSchema(recordFields);
```
##########
nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/test/java/org/apache/nifi/processors/salesforce/util/TestRecordExtender.java:
##########
@@ -0,0 +1,119 @@
+/*
+ * 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.processors.salesforce.util;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.MapRecord;
+import org.apache.nifi.serialization.record.RecordField;
+import org.apache.nifi.serialization.record.RecordFieldType;
+import org.apache.nifi.serialization.record.RecordSchema;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+
+import static org.apache.nifi.processors.salesforce.util.RecordExtender.ATTRIBUTES_RECORD_SCHEMA;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class TestRecordExtender {
+
+ private static ObjectMapper OBJECT_MAPPER;
+ private static RecordSchema ORIGINAL_SCHEMA;
+ private static RecordSchema EXPECTED_EXTENDED_SCHEMA;
+
+ @BeforeAll
+ public static void setup() {
+ OBJECT_MAPPER = new ObjectMapper();
+ ORIGINAL_SCHEMA = new SimpleRecordSchema(Arrays.asList(
+ new RecordField("testRecordField1", RecordFieldType.STRING.getDataType()),
+ new RecordField("testRecordField2", RecordFieldType.STRING.getDataType())
+ ));
+ EXPECTED_EXTENDED_SCHEMA = new SimpleRecordSchema(Arrays.asList(
+ new RecordField("testRecordField1", RecordFieldType.STRING.getDataType()),
+ new RecordField("testRecordField2", RecordFieldType.STRING.getDataType()),
+ new RecordField("attributes", RecordFieldType.RECORD.getRecordDataType(new SimpleRecordSchema(Arrays.asList(
+ new RecordField("type", RecordFieldType.STRING.getDataType()),
+ new RecordField("referenceId", RecordFieldType.STRING.getDataType()
+ )))))
+ ));
+ }
+
+ private RecordExtender testSubject;
+
+ @BeforeEach
+ public void init() {
+ testSubject = new RecordExtender(ORIGINAL_SCHEMA);
+ }
+
+ @Test
+ void testGetWrappedRecordJson() throws IOException {
+ ObjectNode testNode = OBJECT_MAPPER.createObjectNode();
+ testNode.put("testField1", "testValue1");
+ testNode.put("testField2", "testValue2");
+
+ ObjectNode expectedWrappedNode = OBJECT_MAPPER.createObjectNode();
+ expectedWrappedNode.set("records", testNode);
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ out.write(testNode.toString().getBytes());
+
+ ObjectNode actualWrappedJson = testSubject.getWrappedRecordsJson(out);
+
+ assertEquals(expectedWrappedNode, actualWrappedJson);
+ }
+
+ @Test
+ void testGetExtendedSchema() {
+ final SimpleRecordSchema actualExtendedSchema = testSubject.getExtendedSchema(ORIGINAL_SCHEMA);
Review Comment:
```suggestion
final RecordSchema actualExtendedSchema = testSubject.getExtendedSchema();
```
##########
nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/util/RecordExtender.java:
##########
@@ -0,0 +1,90 @@
+/*
+ * 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.processors.salesforce.util;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.MapRecord;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordField;
+import org.apache.nifi.serialization.record.RecordFieldType;
+import org.apache.nifi.serialization.record.RecordSchema;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class RecordExtender {
+
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
+ static final SimpleRecordSchema ATTRIBUTES_RECORD_SCHEMA = new SimpleRecordSchema(Arrays.asList(
+ new RecordField("type", RecordFieldType.STRING.getDataType()),
+ new RecordField("referenceId", RecordFieldType.STRING.getDataType())
+ ));
+
+ private final RecordSchema extendedSchema;
+
+ public RecordExtender(final RecordSchema originalSchema) {
+ extendedSchema = getExtendedSchema(originalSchema);
+ }
+
+ public ObjectNode getWrappedRecordsJson(ByteArrayOutputStream out) throws IOException {
+ ObjectNode root = MAPPER.createObjectNode();
+ JsonNode jsonNode = MAPPER.readTree(out.toByteArray());
+ root.set("records", jsonNode);
+ return root;
+ }
+
+ public MapRecord getExtendedRecord(String objectType, int count, Record record) {
+
+ Set<String> rawFieldNames = record.getRawFieldNames();
+ Map<String, Object> objectMap = rawFieldNames.stream()
+ .collect(Collectors.toMap(Function.identity(), record::getValue));
+
+ Map<String, Object> attributesMap = new HashMap<>();
+ attributesMap.put("type", objectType);
+ attributesMap.put("referenceId", count);
+
+ MapRecord attributesRecord = new MapRecord(ATTRIBUTES_RECORD_SCHEMA, attributesMap);
+
+ objectMap.put("attributes", attributesRecord);
+
+ return new MapRecord(extendedSchema, objectMap);
+ }
+
+ public SimpleRecordSchema getExtendedSchema(RecordSchema original) {
+ List<RecordField> recordFields = new ArrayList<>(original.getFields());
+ recordFields.add(new RecordField("attributes", RecordFieldType.RECORD.getRecordDataType(
+ ATTRIBUTES_RECORD_SCHEMA
+ )));
+ return new SimpleRecordSchema(recordFields);
+ }
+
Review Comment:
This can further be simplified. We truly don't need to do this more than once.
```suggestion
```
##########
nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java:
##########
@@ -0,0 +1,207 @@
+/*
+ * 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.processors.salesforce;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.nifi.NullSuppression;
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.ReadsAttribute;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.json.OutputGrouping;
+import org.apache.nifi.json.WriteJsonResult;
+import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processors.salesforce.util.RecordExtender;
+import org.apache.nifi.processors.salesforce.util.SalesforceRestService;
+import org.apache.nifi.schema.access.NopSchemaAccessWriter;
+import org.apache.nifi.schema.access.SchemaNotFoundException;
+import org.apache.nifi.serialization.MalformedRecordException;
+import org.apache.nifi.serialization.RecordReader;
+import org.apache.nifi.serialization.RecordReaderFactory;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.MapRecord;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordSchema;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.API_URL;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.API_VERSION;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.READ_TIMEOUT;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.TOKEN_PROVIDER;
+
+@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
+@Tags({"salesforce", "sobject", "put"})
+@CapabilityDescription("Posts records to a Salesforce sObject. The type of the Salesforce object must be set in the input flowfile's"
+ + " 'objectType' attribute.")
+@ReadsAttribute(attribute = "objectType", description = "The Salesforce object type to upload records to. E.g. Account, Contact, Campaign.")
+public class PutSalesforceObject extends AbstractProcessor {
+
+ private static final int MAX_RECORD_COUNT = 200;
+
+ protected static final PropertyDescriptor RECORD_READER_FACTORY = new PropertyDescriptor.Builder()
+ .name("record-reader")
+ .displayName("Record Reader")
+ .description(
+ "Specifies the Controller Service to use for parsing incoming data and determining the data's schema")
+ .identifiesControllerService(RecordReaderFactory.class)
+ .required(true)
+ .build();
+
+ static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("For FlowFiles created as a result of a successful execution.")
+ .build();
+
+ static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("For FlowFiles created as a result of an execution error.")
+ .build();
+
+ private static final List<PropertyDescriptor> PROPERTIES = Collections.unmodifiableList(Arrays.asList(
+ API_URL,
+ API_VERSION,
+ READ_TIMEOUT,
+ TOKEN_PROVIDER,
+ RECORD_READER_FACTORY
+ ));
+
+ private static final Set<Relationship> RELATIONSHIPS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+ REL_SUCCESS,
+ REL_FAILURE
+ )));
+
+ private volatile SalesforceRestService salesforceRestService;
+ private volatile int maxRecordCount;
+
+ @Override
+ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+ return PROPERTIES;
+ }
+
+ @Override
+ public Set<Relationship> getRelationships() {
+ return RELATIONSHIPS;
+ }
+
+ @OnScheduled
+ public void onScheduled(final ProcessContext context) {
+ maxRecordCount = getMaxRecordCount();
+
+ String salesforceVersion = context.getProperty(API_VERSION).getValue();
+ String baseUrl = context.getProperty(API_URL).getValue();
+ OAuth2AccessTokenProvider accessTokenProvider =
+ context.getProperty(TOKEN_PROVIDER).asControllerService(OAuth2AccessTokenProvider.class);
+
+ salesforceRestService = new SalesforceRestService(
+ salesforceVersion,
+ baseUrl,
+ () -> accessTokenProvider.getAccessDetails().getAccessToken(),
+ context.getProperty(READ_TIMEOUT).evaluateAttributeExpressions().asTimePeriod(TimeUnit.MILLISECONDS)
+ .intValue()
+ );
+ }
+
+ @Override
+ public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
+ FlowFile flowFile = session.get();
+ if (flowFile == null) {
+ return;
+ }
+
+ String objectType = flowFile.getAttribute("objectType");
+ if (objectType == null) {
+ throw new ProcessException("Salesforce object type not found among the incoming flowfile attributes");
+ }
+
+ RecordReaderFactory readerFactory = context.getProperty(RECORD_READER_FACTORY).asControllerService(RecordReaderFactory.class);
+
+ RecordExtender extender;
+
+ try (InputStream in = session.read(flowFile);
+ RecordReader reader = readerFactory.createRecordReader(flowFile, in, getLogger());
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ WriteJsonResult writer = getWriter(reader.getSchema(), extender = new RecordExtender(reader.getSchema()), out)) {
Review Comment:
```suggestion
WriteJsonResult writer = getWriter(extender = new RecordExtender(reader.getSchema()), out)) {
```
##########
nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java:
##########
@@ -0,0 +1,207 @@
+/*
+ * 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.processors.salesforce;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.nifi.NullSuppression;
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.ReadsAttribute;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.json.OutputGrouping;
+import org.apache.nifi.json.WriteJsonResult;
+import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processors.salesforce.util.RecordExtender;
+import org.apache.nifi.processors.salesforce.util.SalesforceRestService;
+import org.apache.nifi.schema.access.NopSchemaAccessWriter;
+import org.apache.nifi.schema.access.SchemaNotFoundException;
+import org.apache.nifi.serialization.MalformedRecordException;
+import org.apache.nifi.serialization.RecordReader;
+import org.apache.nifi.serialization.RecordReaderFactory;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.MapRecord;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordSchema;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.API_URL;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.API_VERSION;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.READ_TIMEOUT;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.TOKEN_PROVIDER;
+
+@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
+@Tags({"salesforce", "sobject", "put"})
+@CapabilityDescription("Posts records to a Salesforce sObject. The type of the Salesforce object must be set in the input flowfile's"
+ + " 'objectType' attribute.")
+@ReadsAttribute(attribute = "objectType", description = "The Salesforce object type to upload records to. E.g. Account, Contact, Campaign.")
+public class PutSalesforceObject extends AbstractProcessor {
+
+ private static final int MAX_RECORD_COUNT = 200;
+
+ protected static final PropertyDescriptor RECORD_READER_FACTORY = new PropertyDescriptor.Builder()
+ .name("record-reader")
+ .displayName("Record Reader")
+ .description(
+ "Specifies the Controller Service to use for parsing incoming data and determining the data's schema")
+ .identifiesControllerService(RecordReaderFactory.class)
+ .required(true)
+ .build();
+
+ static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("For FlowFiles created as a result of a successful execution.")
+ .build();
+
+ static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("For FlowFiles created as a result of an execution error.")
+ .build();
+
+ private static final List<PropertyDescriptor> PROPERTIES = Collections.unmodifiableList(Arrays.asList(
+ API_URL,
+ API_VERSION,
+ READ_TIMEOUT,
+ TOKEN_PROVIDER,
+ RECORD_READER_FACTORY
+ ));
+
+ private static final Set<Relationship> RELATIONSHIPS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+ REL_SUCCESS,
+ REL_FAILURE
+ )));
+
+ private volatile SalesforceRestService salesforceRestService;
+ private volatile int maxRecordCount;
+
+ @Override
+ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+ return PROPERTIES;
+ }
+
+ @Override
+ public Set<Relationship> getRelationships() {
+ return RELATIONSHIPS;
+ }
+
+ @OnScheduled
+ public void onScheduled(final ProcessContext context) {
+ maxRecordCount = getMaxRecordCount();
+
+ String salesforceVersion = context.getProperty(API_VERSION).getValue();
+ String baseUrl = context.getProperty(API_URL).getValue();
+ OAuth2AccessTokenProvider accessTokenProvider =
+ context.getProperty(TOKEN_PROVIDER).asControllerService(OAuth2AccessTokenProvider.class);
+
+ salesforceRestService = new SalesforceRestService(
+ salesforceVersion,
+ baseUrl,
+ () -> accessTokenProvider.getAccessDetails().getAccessToken(),
+ context.getProperty(READ_TIMEOUT).evaluateAttributeExpressions().asTimePeriod(TimeUnit.MILLISECONDS)
+ .intValue()
+ );
+ }
+
+ @Override
+ public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
+ FlowFile flowFile = session.get();
+ if (flowFile == null) {
+ return;
+ }
+
+ String objectType = flowFile.getAttribute("objectType");
+ if (objectType == null) {
+ throw new ProcessException("Salesforce object type not found among the incoming flowfile attributes");
+ }
+
+ RecordReaderFactory readerFactory = context.getProperty(RECORD_READER_FACTORY).asControllerService(RecordReaderFactory.class);
+
+ RecordExtender extender;
+
+ try (InputStream in = session.read(flowFile);
+ RecordReader reader = readerFactory.createRecordReader(flowFile, in, getLogger());
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ WriteJsonResult writer = getWriter(reader.getSchema(), extender = new RecordExtender(reader.getSchema()), out)) {
+
+ int count = 0;
+ Record record;
+
+ while ((record = reader.nextRecord()) != null) {
+ count++;
+ if (!writer.isActiveRecordSet()) {
+ writer.beginRecordSet();
+ }
+
+ MapRecord extendedRecord = extender.getExtendedRecord(objectType, count, record);
+ writer.write(extendedRecord);
+
+ if (count == maxRecordCount) {
+ count = 0;
+ processRecords(objectType, out, writer, extender);
+ out.reset();
+ }
+ }
+
+ if (writer.isActiveRecordSet()) {
+ processRecords(objectType, out, writer, extender);
+ }
+
+ } catch (MalformedRecordException e) {
+ getLogger().error("Couldn't read records from input", e);
+ session.transfer(flowFile, REL_FAILURE);
+ } catch (SchemaNotFoundException e) {
+ getLogger().error("Couldn't create record writer", e);
+ } catch (IOException e) {
+ getLogger().error("Failed to put records to Salesforce.", e);
+ }
+
+ session.transfer(flowFile, REL_SUCCESS);
+ }
+
+ private void processRecords(String objectType, ByteArrayOutputStream out, WriteJsonResult writer, RecordExtender extender) throws IOException {
+ writer.finishRecordSet();
+ writer.flush();
+ ObjectNode wrappedJson = extender.getWrappedRecordsJson(out);
+ salesforceRestService.postRecord(objectType, wrappedJson.toPrettyString());
+ }
+
+ private WriteJsonResult getWriter(RecordSchema originalSchema, RecordExtender extender, ByteArrayOutputStream out) throws IOException {
+ final SimpleRecordSchema extendedSchema = extender.getExtendedSchema(originalSchema);
Review Comment:
```suggestion
private WriteJsonResult getWriter(RecordExtender extender, ByteArrayOutputStream out) throws IOException {
final RecordSchema extendedSchema = extender.getExtendedSchema();
```
##########
nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java:
##########
@@ -0,0 +1,207 @@
+/*
+ * 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.processors.salesforce;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.nifi.NullSuppression;
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.ReadsAttribute;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.json.OutputGrouping;
+import org.apache.nifi.json.WriteJsonResult;
+import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processors.salesforce.util.RecordExtender;
+import org.apache.nifi.processors.salesforce.util.SalesforceRestService;
+import org.apache.nifi.schema.access.NopSchemaAccessWriter;
+import org.apache.nifi.schema.access.SchemaNotFoundException;
+import org.apache.nifi.serialization.MalformedRecordException;
+import org.apache.nifi.serialization.RecordReader;
+import org.apache.nifi.serialization.RecordReaderFactory;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.MapRecord;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordSchema;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.API_URL;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.API_VERSION;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.READ_TIMEOUT;
+import static org.apache.nifi.processors.salesforce.util.CommonSalesforceProperties.TOKEN_PROVIDER;
+
+@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
+@Tags({"salesforce", "sobject", "put"})
+@CapabilityDescription("Posts records to a Salesforce sObject. The type of the Salesforce object must be set in the input flowfile's"
+ + " 'objectType' attribute.")
+@ReadsAttribute(attribute = "objectType", description = "The Salesforce object type to upload records to. E.g. Account, Contact, Campaign.")
+public class PutSalesforceObject extends AbstractProcessor {
+
+ private static final int MAX_RECORD_COUNT = 200;
+
+ protected static final PropertyDescriptor RECORD_READER_FACTORY = new PropertyDescriptor.Builder()
+ .name("record-reader")
+ .displayName("Record Reader")
+ .description(
+ "Specifies the Controller Service to use for parsing incoming data and determining the data's schema")
+ .identifiesControllerService(RecordReaderFactory.class)
+ .required(true)
+ .build();
+
+ static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("For FlowFiles created as a result of a successful execution.")
+ .build();
+
+ static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("For FlowFiles created as a result of an execution error.")
+ .build();
+
+ private static final List<PropertyDescriptor> PROPERTIES = Collections.unmodifiableList(Arrays.asList(
+ API_URL,
+ API_VERSION,
+ READ_TIMEOUT,
+ TOKEN_PROVIDER,
+ RECORD_READER_FACTORY
+ ));
+
+ private static final Set<Relationship> RELATIONSHIPS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+ REL_SUCCESS,
+ REL_FAILURE
+ )));
+
+ private volatile SalesforceRestService salesforceRestService;
+ private volatile int maxRecordCount;
+
+ @Override
+ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+ return PROPERTIES;
+ }
+
+ @Override
+ public Set<Relationship> getRelationships() {
+ return RELATIONSHIPS;
+ }
+
+ @OnScheduled
+ public void onScheduled(final ProcessContext context) {
+ maxRecordCount = getMaxRecordCount();
+
+ String salesforceVersion = context.getProperty(API_VERSION).getValue();
+ String baseUrl = context.getProperty(API_URL).getValue();
+ OAuth2AccessTokenProvider accessTokenProvider =
+ context.getProperty(TOKEN_PROVIDER).asControllerService(OAuth2AccessTokenProvider.class);
+
+ salesforceRestService = new SalesforceRestService(
+ salesforceVersion,
+ baseUrl,
+ () -> accessTokenProvider.getAccessDetails().getAccessToken(),
+ context.getProperty(READ_TIMEOUT).evaluateAttributeExpressions().asTimePeriod(TimeUnit.MILLISECONDS)
+ .intValue()
+ );
+ }
+
+ @Override
+ public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
+ FlowFile flowFile = session.get();
+ if (flowFile == null) {
+ return;
+ }
+
+ String objectType = flowFile.getAttribute("objectType");
+ if (objectType == null) {
+ throw new ProcessException("Salesforce object type not found among the incoming flowfile attributes");
+ }
+
+ RecordReaderFactory readerFactory = context.getProperty(RECORD_READER_FACTORY).asControllerService(RecordReaderFactory.class);
+
+ RecordExtender extender;
+
+ try (InputStream in = session.read(flowFile);
+ RecordReader reader = readerFactory.createRecordReader(flowFile, in, getLogger());
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ WriteJsonResult writer = getWriter(reader.getSchema(), extender = new RecordExtender(reader.getSchema()), out)) {
+
+ int count = 0;
+ Record record;
+
+ while ((record = reader.nextRecord()) != null) {
+ count++;
+ if (!writer.isActiveRecordSet()) {
+ writer.beginRecordSet();
+ }
+
+ MapRecord extendedRecord = extender.getExtendedRecord(objectType, count, record);
+ writer.write(extendedRecord);
+
+ if (count == maxRecordCount) {
+ count = 0;
+ processRecords(objectType, out, writer, extender);
+ out.reset();
+ }
+ }
+
+ if (writer.isActiveRecordSet()) {
+ processRecords(objectType, out, writer, extender);
+ }
+
+ } catch (MalformedRecordException e) {
+ getLogger().error("Couldn't read records from input", e);
+ session.transfer(flowFile, REL_FAILURE);
+ } catch (SchemaNotFoundException e) {
+ getLogger().error("Couldn't create record writer", e);
+ } catch (IOException e) {
+ getLogger().error("Failed to put records to Salesforce.", e);
+ }
+
+ session.transfer(flowFile, REL_SUCCESS);
+ }
Review Comment:
I think the success/failure handling is not working as intended.
Maybe this is the correct one:
```suggestion
if (writer.isActiveRecordSet()) {
processRecords(objectType, out, writer, extender);
}
session.transfer(flowFile, REL_SUCCESS);
} catch (MalformedRecordException e) {
getLogger().error("Couldn't read records from input", e);
session.transfer(flowFile, REL_FAILURE);
} catch (SchemaNotFoundException e) {
getLogger().error("Couldn't create record writer", e);
session.transfer(flowFile, REL_FAILURE);
} catch (IOException e) {
getLogger().error("Failed to put records to Salesforce.", e);
session.transfer(flowFile, REL_FAILURE);
}
}
```
--
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