Fixing SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR error

aws · Apr 23, 2024 · 2ba7f6c · 2ba7f6c
1 parent 78ce418
commit 2ba7f6c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/software/amazon/event/ruler/input/DefaultParser.java b/src/main/software/amazon/event/ruler/input/DefaultParser.java
@@ -44,12 +44,12 @@ public class DefaultParser implements MatchTypeParser, ByteParser {
     private final SuffixParser suffixParser;
     private final SuffixEqualsIgnoreCaseParser suffixEqualsIgnoreCaseParser;
 
-    DefaultParser() {
+    private DefaultParser() {
         this(new WildcardParser(), new EqualsIgnoreCaseParser(), new SuffixParser(), new SuffixEqualsIgnoreCaseParser());
     }
 
-    DefaultParser(WildcardParser wildcardParser, EqualsIgnoreCaseParser equalsIgnoreCaseParser, SuffixParser suffixParser,
-                  SuffixEqualsIgnoreCaseParser suffixEqualsIgnoreCaseParser) {
+    private DefaultParser(WildcardParser wildcardParser, EqualsIgnoreCaseParser equalsIgnoreCaseParser,
+                          SuffixParser suffixParser, SuffixEqualsIgnoreCaseParser suffixEqualsIgnoreCaseParser) {
         this.wildcardParser = wildcardParser;
         this.equalsIgnoreCaseParser = equalsIgnoreCaseParser;
         this.suffixParser = suffixParser;
@@ -60,6 +60,11 @@ public static synchronized DefaultParser getParser() {
         return SINGLETON;
     }
 
+    static DefaultParser getNonSingletonParserForTesting(WildcardParser wildcardParser, EqualsIgnoreCaseParser equalsIgnoreCaseParser,
+                                          SuffixParser suffixParser, SuffixEqualsIgnoreCaseParser suffixEqualsIgnoreCaseParser) {
+        return new DefaultParser(wildcardParser, equalsIgnoreCaseParser, suffixParser, suffixEqualsIgnoreCaseParser);
+    }
+
     @Override
     public InputCharacter[] parse(final MatchType type, final String value) {
         if (type == WILDCARD || type == ANYTHING_BUT_WILDCARD) {

diff --git a/src/test/software/amazon/event/ruler/input/ParserTest.java b/src/test/software/amazon/event/ruler/input/ParserTest.java
@@ -26,7 +26,7 @@ public void testParseString() {
     @Test
     public void testOtherMatchTypes() {
         final int[] parserInvokedCount = { 0, 0, 0, 0 };
-        DefaultParser parser = new DefaultParser(
+        DefaultParser parser = DefaultParser.getNonSingletonParserForTesting(
             new WildcardParser() {
                 @Override
                 public InputCharacter[] parse(String value) {