From 0aa4dd065ee78f9acc88b39625cc4a9b47f6c944 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 9 Feb 2022 21:37:28 +0100 Subject: refactor: continues with staged builder refactoring --- .../ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java | 17 ++++------------- .../gradleplugins/GradleBuildFileConversionTest.java | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java index cae01d5..d7fe9f1 100644 --- a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java +++ b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java @@ -10,20 +10,11 @@ public final class FregeDTOBuilder implements Builder { private String compilerFlags = ""; private String replSource = ""; - private static volatile FregeDTOBuilder instance; + private FregeDTOBuilder() {} - private FregeDTOBuilder() { - } - - public static FregeDTOBuilder getInstance() { - FregeDTOBuilder result = instance; - if (result != null) { - return result; - } else { - synchronized (FregeDTOBuilder.class) { - return (instance == null) ? new FregeDTOBuilder() : instance; - } - } + public static FregeDTOBuilder builder() + { + return new FregeDTOBuilder(); } diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java b/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java index c1c920b..cfc60bb 100644 --- a/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java +++ b/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java @@ -33,7 +33,7 @@ public class GradleBuildFileConversionTest { @BeforeEach void setup() { - fregeBuilder = FregeDTOBuilder.getInstance(); + fregeBuilder = FregeDTOBuilder.builder(); } @Nested -- cgit