Skip to content

Commit 266b1c8

Browse files
MoonBow-1MoonBow-1
authored
Rename cfe_16-metadata SDElement to CFE-16-metadata (#66)
1 parent 7cd66d8 commit 266b1c8

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎src/main/java/com/teragrep/cfe_16/bo/HECRecordImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public boolean isStub() {
231231
*/
232232
private SDElement structuredDataParams(final long fallbackEpoch) {
233233
LOGGER.debug("Setting Structured Data params");
234-
final SDElement metadataSDE = new SDElement("cfe_16-metadata@48577");
234+
final SDElement metadataSDE = new SDElement("CFE-16-metadata@48577");
235235

236236
if (this.authenticationToken() != null) {
237237
LOGGER.debug("Setting authentication token");

‎src/test/java/com/teragrep/cfe_16/EventDataToSyslogMessageTest.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void testFieldsWhenTimeIsProvidedInHECRecord() {
7777
// Timestamp used as fallback value for HECRecord time
7878
final Facility expectedFacility = Facility.USER;
7979
final Severity expectedSeverity = Severity.INFORMATIONAL;
80-
final SDElement expectedMetadataSDE1 = new SDElement("cfe_16-metadata@48577");
80+
final SDElement expectedMetadataSDE1 = new SDElement("CFE-16-metadata@48577");
8181

8282
final HECRecordImpl hecRecord1 = new HECRecordImpl(
8383
"CHANNEL_11111",
@@ -157,17 +157,17 @@ void testSdElementsWhenTimeIsProvidedInHECRecord() {
157157
.stream()
158158
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));
159159

160-
Assertions.assertTrue(sdElementMap.containsKey("cfe_16-metadata@48577"));
160+
Assertions.assertTrue(sdElementMap.containsKey("CFE-16-metadata@48577"));
161161
Assertions.assertTrue(sdElementMap.containsKey("cfe_16-origin@48577"));
162162

163163
Assertions
164-
.assertEquals("AUTH_TOKEN_11111", sdElementMap.get("cfe_16-metadata@48577").get("authentication_token"));
165-
Assertions.assertEquals("CHANNEL_11111", sdElementMap.get("cfe_16-metadata@48577").get("channel"));
166-
Assertions.assertEquals("0", sdElementMap.get("cfe_16-metadata@48577").get("ack_id"));
167-
Assertions.assertEquals("reported", sdElementMap.get("cfe_16-metadata@48577").get("time_source"));
168-
Assertions.assertEquals("true", sdElementMap.get("cfe_16-metadata@48577").get("time_parsed"));
169-
Assertions.assertEquals(String.valueOf(1433188255253L), sdElementMap.get("cfe_16-metadata@48577").get("time"));
170-
Assertions.assertEquals("false", sdElementMap.get("cfe_16-metadata@48577").get("generated"));
164+
.assertEquals("AUTH_TOKEN_11111", sdElementMap.get("CFE-16-metadata@48577").get("authentication_token"));
165+
Assertions.assertEquals("CHANNEL_11111", sdElementMap.get("CFE-16-metadata@48577").get("channel"));
166+
Assertions.assertEquals("0", sdElementMap.get("CFE-16-metadata@48577").get("ack_id"));
167+
Assertions.assertEquals("reported", sdElementMap.get("CFE-16-metadata@48577").get("time_source"));
168+
Assertions.assertEquals("true", sdElementMap.get("CFE-16-metadata@48577").get("time_parsed"));
169+
Assertions.assertEquals(String.valueOf(1433188255253L), sdElementMap.get("CFE-16-metadata@48577").get("time"));
170+
Assertions.assertEquals("false", sdElementMap.get("CFE-16-metadata@48577").get("generated"));
171171
}
172172

173173
@Test
@@ -178,7 +178,7 @@ void testFieldsWhenTimeIsNotProvidedInHECRecord() {
178178

179179
final Facility expectedFacility = Facility.USER;
180180
final Severity expectedSeverity = Severity.INFORMATIONAL;
181-
final SDElement expectedMetadataSDE2 = new SDElement("cfe_16-metadata@48577");
181+
final SDElement expectedMetadataSDE2 = new SDElement("CFE-16-metadata@48577");
182182

183183
final HECRecordImpl hecRecord2 = new HECRecordImpl(
184184
"CHANNEL_22222",
@@ -256,17 +256,17 @@ void testSdElementsWhenTimeIsNotProvidedInHECRecord() {
256256
.stream()
257257
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));
258258

259-
Assertions.assertTrue(sdElementMap.containsKey("cfe_16-metadata@48577"));
259+
Assertions.assertTrue(sdElementMap.containsKey("CFE-16-metadata@48577"));
260260
Assertions.assertTrue(sdElementMap.containsKey("cfe_16-origin@48577"));
261261

262262
Assertions
263-
.assertEquals("AUTH_TOKEN_22222", sdElementMap.get("cfe_16-metadata@48577").get("authentication_token"));
264-
Assertions.assertEquals("CHANNEL_22222", sdElementMap.get("cfe_16-metadata@48577").get("channel"));
265-
Assertions.assertEquals("1", sdElementMap.get("cfe_16-metadata@48577").get("ack_id"));
266-
Assertions.assertEquals("generated", sdElementMap.get("cfe_16-metadata@48577").get("time_source"));
267-
Assertions.assertEquals("false", sdElementMap.get("cfe_16-metadata@48577").get("time_parsed"));
268-
Assertions.assertEquals(String.valueOf(currentEpoch), sdElementMap.get("cfe_16-metadata@48577").get("time"));
269-
Assertions.assertEquals("true", sdElementMap.get("cfe_16-metadata@48577").get("generated"));
263+
.assertEquals("AUTH_TOKEN_22222", sdElementMap.get("CFE-16-metadata@48577").get("authentication_token"));
264+
Assertions.assertEquals("CHANNEL_22222", sdElementMap.get("CFE-16-metadata@48577").get("channel"));
265+
Assertions.assertEquals("1", sdElementMap.get("CFE-16-metadata@48577").get("ack_id"));
266+
Assertions.assertEquals("generated", sdElementMap.get("CFE-16-metadata@48577").get("time_source"));
267+
Assertions.assertEquals("false", sdElementMap.get("CFE-16-metadata@48577").get("time_parsed"));
268+
Assertions.assertEquals(String.valueOf(currentEpoch), sdElementMap.get("CFE-16-metadata@48577").get("time"));
269+
Assertions.assertEquals("true", sdElementMap.get("CFE-16-metadata@48577").get("generated"));
270270
}
271271

272272
@Test
@@ -275,7 +275,7 @@ void testFieldsWhenTimeIsNotProvidedAndAckIdIsNullInHECRecord() {
275275
// Timestamp used as fallback value for HECRecord time
276276
final long currentEpoch = Instant.now().toEpochMilli();
277277

278-
final SDElement expectedMetadataSDE3 = new SDElement("cfe_16-metadata@48577");
278+
final SDElement expectedMetadataSDE3 = new SDElement("CFE-16-metadata@48577");
279279
final Severity expectedSeverity = Severity.INFORMATIONAL;
280280
final Facility expectedFacility = Facility.USER;
281281
final HECRecordImpl hecRecord3 = new HECRecordImpl(
@@ -352,17 +352,17 @@ void testSdElementsWhenTimeIsNotProvidedAndAckIdIsNullInHECRecord() {
352352
.stream()
353353
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));
354354

355-
Assertions.assertTrue(sdElementMap.containsKey("cfe_16-metadata@48577"));
355+
Assertions.assertTrue(sdElementMap.containsKey("CFE-16-metadata@48577"));
356356
Assertions.assertTrue(sdElementMap.containsKey("cfe_16-origin@48577"));
357357

358358
Assertions
359-
.assertEquals("AUTH_TOKEN_33333", sdElementMap.get("cfe_16-metadata@48577").get("authentication_token"));
360-
Assertions.assertEquals("defaultchannel", sdElementMap.get("cfe_16-metadata@48577").get("channel"));
359+
.assertEquals("AUTH_TOKEN_33333", sdElementMap.get("CFE-16-metadata@48577").get("authentication_token"));
360+
Assertions.assertEquals("defaultchannel", sdElementMap.get("CFE-16-metadata@48577").get("channel"));
361361
Assertions
362-
.assertFalse(sdElementMap.get("cfe_16-metadata@48577").containsKey("ack_id"), "ack_id should not be in SDElements since it is null");
363-
Assertions.assertEquals("generated", sdElementMap.get("cfe_16-metadata@48577").get("time_source"));
364-
Assertions.assertEquals("false", sdElementMap.get("cfe_16-metadata@48577").get("time_parsed"));
365-
Assertions.assertEquals(String.valueOf(currentEpoch), sdElementMap.get("cfe_16-metadata@48577").get("time"));
366-
Assertions.assertEquals("true", sdElementMap.get("cfe_16-metadata@48577").get("generated"));
362+
.assertFalse(sdElementMap.get("CFE-16-metadata@48577").containsKey("ack_id"), "ack_id should not be in SDElements since it is null");
363+
Assertions.assertEquals("generated", sdElementMap.get("CFE-16-metadata@48577").get("time_source"));
364+
Assertions.assertEquals("false", sdElementMap.get("CFE-16-metadata@48577").get("time_parsed"));
365+
Assertions.assertEquals(String.valueOf(currentEpoch), sdElementMap.get("CFE-16-metadata@48577").get("time"));
366+
Assertions.assertEquals("true", sdElementMap.get("CFE-16-metadata@48577").get("generated"));
367367
}
368368
}

0 commit comments

Comments
 (0)