Fix formatter properties init order

rfoltyns · Feb 10, 2021 · cbf8f0a · cbf8f0a
1 parent 6f4d3a3
commit cbf8f0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...arch-core/src/main/java/org/appenders/log4j2/elasticsearch/RollingIndexNameFormatter.java b/...arch-core/src/main/java/org/appenders/log4j2/elasticsearch/RollingIndexNameFormatter.java
@@ -74,8 +74,8 @@ protected RollingIndexNameFormatter(String indexName, String pattern, long initT
         this.indexName = indexName;
         this.fastDateFormat = FastDateFormat.getInstance(pattern, timeZone);
         this.patternProcessor = createPatternProcessor(pattern);
-        this.currentName = doFormat(indexName, initTimeInMillis);
         this.separator = separator;
+        this.currentName = doFormat(indexName, initTimeInMillis);
 
         long previousTime = this.patternProcessor.getNextTime(initTimeInMillis, -1, false);
         this.patternProcessor.setPrevFileTime(previousTime);

diff --git a/...-core/src/test/java/org/appenders/log4j2/elasticsearch/RollingIndexNameFormatterTest.java b/...-core/src/test/java/org/appenders/log4j2/elasticsearch/RollingIndexNameFormatterTest.java
@@ -158,9 +158,9 @@ public void returnsCustomSeparatorFormattedIndexName() {
         // given
         LogEvent logEvent = mock(LogEvent.class);
         when(logEvent.getTimeMillis()).thenReturn(DEFAULT_TEST_TIME_IN_MILLIS);
-        RollingIndexNameFormatter.Builder builder = createRollingIndexNameFormatterBuilder();
-        builder.withSeparator(".");
-        IndexNameFormatter formatter = builder.build();
+        RollingIndexNameFormatter formatter = createRollingIndexNameFormatterBuilder()
+                .withSeparator(".")
+                .build();
 
         // when
         String formattedIndexName = formatter.format(logEvent);