Skip to content

Commit b68d5fa

Browse files
joegallojoegallo
committed
Conserve precious characters
1 parent 76ae97a commit b68d5fa

File tree

3 files changed

+98
-98
lines changed

3 files changed

+98
-98
lines changed

‎modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CommunityIdProcessor.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -131,26 +131,26 @@ public boolean getIgnoreMissing() {
131131
}
132132

133133
@Override
134-
public IngestDocument execute(IngestDocument ingestDocument) throws Exception {
135-
String sourceIp = ingestDocument.getFieldValue(sourceIpField, String.class, ignoreMissing);
136-
String destinationIp = ingestDocument.getFieldValue(destinationIpField, String.class, ignoreMissing);
137-
Object ianaNumber = ingestDocument.getFieldValue(ianaNumberField, Object.class, true);
138-
Supplier<Object> transport = () -> ingestDocument.getFieldValue(transportField, Object.class, ignoreMissing);
139-
Supplier<Object> sourcePort = () -> ingestDocument.getFieldValue(sourcePortField, Object.class, ignoreMissing);
140-
Supplier<Object> destinationPort = () -> ingestDocument.getFieldValue(destinationPortField, Object.class, ignoreMissing);
141-
Object icmpType = ingestDocument.getFieldValue(icmpTypeField, Object.class, true);
142-
Object icmpCode = ingestDocument.getFieldValue(icmpCodeField, Object.class, true);
134+
public IngestDocument execute(IngestDocument document) throws Exception {
135+
String sourceIp = document.getFieldValue(sourceIpField, String.class, ignoreMissing);
136+
String destinationIp = document.getFieldValue(destinationIpField, String.class, ignoreMissing);
137+
Object ianaNumber = document.getFieldValue(ianaNumberField, Object.class, true);
138+
Supplier<Object> transport = () -> document.getFieldValue(transportField, Object.class, ignoreMissing);
139+
Supplier<Object> sourcePort = () -> document.getFieldValue(sourcePortField, Object.class, ignoreMissing);
140+
Supplier<Object> destinationPort = () -> document.getFieldValue(destinationPortField, Object.class, ignoreMissing);
141+
Object icmpType = document.getFieldValue(icmpTypeField, Object.class, true);
142+
Object icmpCode = document.getFieldValue(icmpCodeField, Object.class, true);
143143
Flow flow = buildFlow(sourceIp, destinationIp, ianaNumber, transport, sourcePort, destinationPort, icmpType, icmpCode);
144144
if (flow == null) {
145145
if (ignoreMissing) {
146-
return ingestDocument;
146+
return document;
147147
} else {
148148
throw new IllegalArgumentException("unable to construct flow from document");
149149
}
150150
}
151151

152-
ingestDocument.setFieldValue(targetField, flow.toCommunityId(seed));
153-
return ingestDocument;
152+
document.setFieldValue(targetField, flow.toCommunityId(seed));
153+
return document;
154154
}
155155

156156
public static String apply(
@@ -295,28 +295,28 @@ public static final class Factory implements Processor.Factory {
295295
@Override
296296
public CommunityIdProcessor create(
297297
Map<String, Processor.Factory> registry,
298-
String processorTag,
298+
String tag,
299299
String description,
300300
Map<String, Object> config,
301301
ProjectId projectId
302302
) throws Exception {
303-
String sourceIpField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "source_ip", DEFAULT_SOURCE_IP);
304-
String sourcePortField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "source_port", DEFAULT_SOURCE_PORT);
305-
String destIpField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "destination_ip", DEFAULT_DEST_IP);
306-
String destPortField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "destination_port", DEFAULT_DEST_PORT);
307-
String ianaNumberField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "iana_number", DEFAULT_IANA_NUMBER);
308-
String transportField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "transport", DEFAULT_TRANSPORT);
309-
String icmpTypeField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "icmp_type", DEFAULT_ICMP_TYPE);
310-
String icmpCodeField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "icmp_code", DEFAULT_ICMP_CODE);
311-
String targetField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "target_field", DEFAULT_TARGET);
312-
int seedInt = ConfigurationUtils.readIntProperty(TYPE, processorTag, config, "seed", 0);
303+
String sourceIpField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "source_ip", DEFAULT_SOURCE_IP);
304+
String sourcePortField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "source_port", DEFAULT_SOURCE_PORT);
305+
String destIpField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "destination_ip", DEFAULT_DEST_IP);
306+
String destPortField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "destination_port", DEFAULT_DEST_PORT);
307+
String ianaNumberField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "iana_number", DEFAULT_IANA_NUMBER);
308+
String transportField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "transport", DEFAULT_TRANSPORT);
309+
String icmpTypeField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "icmp_type", DEFAULT_ICMP_TYPE);
310+
String icmpCodeField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "icmp_code", DEFAULT_ICMP_CODE);
311+
String targetField = ConfigurationUtils.readStringProperty(TYPE, tag, config, "target_field", DEFAULT_TARGET);
312+
int seedInt = ConfigurationUtils.readIntProperty(TYPE, tag, config, "seed", 0);
313313
if (seedInt < 0 || seedInt > 65535) {
314-
throw newConfigurationException(TYPE, processorTag, "seed", "must be a value between 0 and 65535");
314+
throw newConfigurationException(TYPE, tag, "seed", "must be a value between 0 and 65535");
315315
}
316316

317-
boolean ignoreMissing = readBooleanProperty(TYPE, processorTag, config, "ignore_missing", true);
317+
boolean ignoreMissing = readBooleanProperty(TYPE, tag, config, "ignore_missing", true);
318318
return new CommunityIdProcessor(
319-
processorTag,
319+
tag,
320320
description,
321321
sourceIpField,
322322
sourcePortField,

‎modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/CommunityIdProcessorFactoryTests.java‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,61 +64,61 @@ public void testCreate() throws Exception {
6464
boolean ignoreMissing = randomBoolean();
6565
config.put("ignore_missing", ignoreMissing);
6666

67-
String processorTag = randomAlphaOfLength(10);
68-
CommunityIdProcessor communityIdProcessor = factory.create(null, processorTag, null, config, null);
69-
assertThat(communityIdProcessor.getTag(), equalTo(processorTag));
70-
assertThat(communityIdProcessor.getSourceIpField(), equalTo(sourceIpField));
71-
assertThat(communityIdProcessor.getSourcePortField(), equalTo(sourcePortField));
72-
assertThat(communityIdProcessor.getDestinationIpField(), equalTo(destIpField));
73-
assertThat(communityIdProcessor.getDestinationPortField(), equalTo(destPortField));
74-
assertThat(communityIdProcessor.getIanaNumberField(), equalTo(ianaNumberField));
75-
assertThat(communityIdProcessor.getTransportField(), equalTo(transportField));
76-
assertThat(communityIdProcessor.getIcmpTypeField(), equalTo(icmpTypeField));
77-
assertThat(communityIdProcessor.getIcmpCodeField(), equalTo(icmpCodeField));
78-
assertThat(communityIdProcessor.getTargetField(), equalTo(targetField));
79-
assertThat(communityIdProcessor.getSeed(), equalTo(toUint16(seedInt)));
80-
assertThat(communityIdProcessor.getIgnoreMissing(), equalTo(ignoreMissing));
67+
String tag = randomAlphaOfLength(10);
68+
CommunityIdProcessor processor = factory.create(null, tag, null, config, null);
69+
assertThat(processor.getTag(), equalTo(tag));
70+
assertThat(processor.getSourceIpField(), equalTo(sourceIpField));
71+
assertThat(processor.getSourcePortField(), equalTo(sourcePortField));
72+
assertThat(processor.getDestinationIpField(), equalTo(destIpField));
73+
assertThat(processor.getDestinationPortField(), equalTo(destPortField));
74+
assertThat(processor.getIanaNumberField(), equalTo(ianaNumberField));
75+
assertThat(processor.getTransportField(), equalTo(transportField));
76+
assertThat(processor.getIcmpTypeField(), equalTo(icmpTypeField));
77+
assertThat(processor.getIcmpCodeField(), equalTo(icmpCodeField));
78+
assertThat(processor.getTargetField(), equalTo(targetField));
79+
assertThat(processor.getSeed(), equalTo(toUint16(seedInt)));
80+
assertThat(processor.getIgnoreMissing(), equalTo(ignoreMissing));
8181
}
8282

8383
public void testSeed() throws Exception {
8484
Map<String, Object> config = new HashMap<>();
85-
String processorTag = randomAlphaOfLength(10);
85+
String tag = randomAlphaOfLength(10);
8686

8787
// negative seeds are rejected
8888
int tooSmallSeed = randomIntBetween(Integer.MIN_VALUE, -1);
8989
config.put("seed", Integer.toString(tooSmallSeed));
90-
ElasticsearchException e = expectThrows(ElasticsearchException.class, () -> factory.create(null, processorTag, null, config, null));
90+
ElasticsearchException e = expectThrows(ElasticsearchException.class, () -> factory.create(null, tag, null, config, null));
9191
assertThat(e.getMessage(), containsString("must be a value between 0 and 65535"));
9292

9393
// seeds >= 2^16 are rejected
9494
int tooBigSeed = randomIntBetween(65536, Integer.MAX_VALUE);
9595
config.put("seed", Integer.toString(tooBigSeed));
96-
e = expectThrows(ElasticsearchException.class, () -> factory.create(null, processorTag, null, config, null));
96+
e = expectThrows(ElasticsearchException.class, () -> factory.create(null, tag, null, config, null));
9797
assertThat(e.getMessage(), containsString("must be a value between 0 and 65535"));
9898

9999
// seeds between 0 and 2^16-1 are accepted
100100
int justRightSeed = randomIntBetween(0, 65535);
101101
byte[] expectedSeed = new byte[] { (byte) (justRightSeed >> 8), (byte) justRightSeed };
102102
config.put("seed", Integer.toString(justRightSeed));
103-
CommunityIdProcessor communityIdProcessor = factory.create(null, processorTag, null, config, null);
104-
assertThat(communityIdProcessor.getSeed(), equalTo(expectedSeed));
103+
CommunityIdProcessor processor = factory.create(null, tag, null, config, null);
104+
assertThat(processor.getSeed(), equalTo(expectedSeed));
105105
}
106106

107107
public void testRequiredFields() throws Exception {
108108
HashMap<String, Object> config = new HashMap<>();
109-
String processorTag = randomAlphaOfLength(10);
110-
CommunityIdProcessor communityIdProcessor = factory.create(null, processorTag, null, config, null);
111-
assertThat(communityIdProcessor.getTag(), equalTo(processorTag));
112-
assertThat(communityIdProcessor.getSourceIpField(), equalTo(DEFAULT_SOURCE_IP));
113-
assertThat(communityIdProcessor.getSourcePortField(), equalTo(DEFAULT_SOURCE_PORT));
114-
assertThat(communityIdProcessor.getDestinationIpField(), equalTo(DEFAULT_DEST_IP));
115-
assertThat(communityIdProcessor.getDestinationPortField(), equalTo(DEFAULT_DEST_PORT));
116-
assertThat(communityIdProcessor.getIanaNumberField(), equalTo(DEFAULT_IANA_NUMBER));
117-
assertThat(communityIdProcessor.getTransportField(), equalTo(DEFAULT_TRANSPORT));
118-
assertThat(communityIdProcessor.getIcmpTypeField(), equalTo(DEFAULT_ICMP_TYPE));
119-
assertThat(communityIdProcessor.getIcmpCodeField(), equalTo(DEFAULT_ICMP_CODE));
120-
assertThat(communityIdProcessor.getTargetField(), equalTo(DEFAULT_TARGET));
121-
assertThat(communityIdProcessor.getSeed(), equalTo(toUint16(0)));
122-
assertThat(communityIdProcessor.getIgnoreMissing(), equalTo(true));
109+
String tag = randomAlphaOfLength(10);
110+
CommunityIdProcessor processor = factory.create(null, tag, null, config, null);
111+
assertThat(processor.getTag(), equalTo(tag));
112+
assertThat(processor.getSourceIpField(), equalTo(DEFAULT_SOURCE_IP));
113+
assertThat(processor.getSourcePortField(), equalTo(DEFAULT_SOURCE_PORT));
114+
assertThat(processor.getDestinationIpField(), equalTo(DEFAULT_DEST_IP));
115+
assertThat(processor.getDestinationPortField(), equalTo(DEFAULT_DEST_PORT));
116+
assertThat(processor.getIanaNumberField(), equalTo(DEFAULT_IANA_NUMBER));
117+
assertThat(processor.getTransportField(), equalTo(DEFAULT_TRANSPORT));
118+
assertThat(processor.getIcmpTypeField(), equalTo(DEFAULT_ICMP_TYPE));
119+
assertThat(processor.getIcmpCodeField(), equalTo(DEFAULT_ICMP_CODE));
120+
assertThat(processor.getTargetField(), equalTo(DEFAULT_TARGET));
121+
assertThat(processor.getSeed(), equalTo(toUint16(0)));
122+
assertThat(processor.getIgnoreMissing(), equalTo(true));
123123
}
124124
}

0 commit comments

Comments
 (0)