Merge branch 'lpbak-master'

jmrozanec · Sep 14, 2016 · 6763716 · 6763716
2 parents e84ff91 + 66f697a
commit 6763716
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/src/main/java/com/cronutils/model/time/generator/FieldValueGeneratorFactory.java b/src/main/java/com/cronutils/model/time/generator/FieldValueGeneratorFactory.java
@@ -18,13 +18,8 @@
  * limitations under the License.
  */
 public class FieldValueGeneratorFactory {
-    private static FieldValueGeneratorFactory factory = new FieldValueGeneratorFactory();
     private FieldValueGeneratorFactory(){}
 
-    public static FieldValueGeneratorFactory instance(){
-        return factory;
-    }
-
     public static FieldValueGenerator forCronField(CronField cronField){
         FieldExpression fieldExpression = cronField.getExpression();
         if(fieldExpression instanceof Always){

diff --git a/src/test/java/com/cronutils/model/time/generator/FieldValueGeneratorFactoryTest.java b/src/test/java/com/cronutils/model/time/generator/FieldValueGeneratorFactoryTest.java
@@ -26,30 +26,22 @@
  * limitations under the License.
  */
 public class FieldValueGeneratorFactoryTest {
-    private FieldValueGeneratorFactory fieldValueGeneratorFactory;
-
     private CronField mockCronField;
     @Before
     public void setUp() throws Exception {
-        fieldValueGeneratorFactory = FieldValueGeneratorFactory.instance();
         mockCronField = mock(CronField.class);
     }
 
-    @Test
-    public void testInstance() throws Exception {
-        assertNotNull(FieldValueGeneratorFactory.instance());
-    }
-
     @Test
     public void testForCronFieldAlways() throws Exception {
         when(mockCronField.getExpression()).thenReturn(mock(Always.class));
-        assertEquals(AlwaysFieldValueGenerator.class, fieldValueGeneratorFactory.forCronField(mockCronField).getClass());
+        assertEquals(AlwaysFieldValueGenerator.class, FieldValueGeneratorFactory.forCronField(mockCronField).getClass());
     }
 
     @Test
     public void testForCronFieldAnd() throws Exception {
         when(mockCronField.getExpression()).thenReturn(mock(And.class));
-        assertEquals(AndFieldValueGenerator.class, fieldValueGeneratorFactory.forCronField(mockCronField).getClass());
+        assertEquals(AndFieldValueGenerator.class, FieldValueGeneratorFactory.forCronField(mockCronField).getClass());
     }
 
     @Test