/*
 * Copyright 2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.gradle.api.internal.model;

import org.gradle.api.Named;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.reflect.ObjectInstantiationException;
import org.gradle.internal.reflect.DirectInstantiator;
import org.gradle.internal.reflect.Instantiator;

public class DefaultObjectFactory implements ObjectFactory {
    public static final DefaultObjectFactory INSTANCE = new DefaultObjectFactory();

    private final Instantiator instantiator;
    private final NamedObjectInstantiator namedObjectInstantiator;

    private DefaultObjectFactory() {
        instantiator = DirectInstantiator.INSTANCE;
        namedObjectInstantiator = new NamedObjectInstantiator();
    }

    @Override
    public <T extends Named> T named(final Class<T> type, final String name) {
        return namedObjectInstantiator.named(type, name);
    }

    @Override
    public <T> T newInstance(Class<? extends T> type, Object... parameters) throws ObjectInstantiationException {
        return instantiator.newInstance(type, parameters);
    }
}

@@ -1029,19 +1029,77 @@
 Factory(
+DirectInstantiator.INSTANCE, new NamedObjectInstantiator()
 );%0A
-
 %0A    pri
@@ -1209,22 +1209,21 @@
 ;%0A%0A    p
-rivate
+ublic
  Default
@@ -1236,16 +1236,90 @@
 Factory(
+Instantiator instantiator, NamedObjectInstantiator namedObjectInstantiator
 ) %7B%0A    
@@ -1322,16 +1322,21 @@
         
+this.
 instanti
@@ -1342,23 +1342,17 @@
 iator = 
-DirectI
+i
 nstantia
@@ -1354,25 +1354,16 @@
 antiator
-.INSTANCE
 ;%0A      
@@ -1364,16 +1364,21 @@
         
+this.
 namedObj
@@ -1396,20 +1396,16 @@
 ator = n
-ew N
 amedObje
@@ -1418,18 +1418,16 @@
 antiator
-()
 ;%0A    %7D%0A
@@ -1419,32 +1419,33 @@
 ntiator;%0A    %7D%0A%0A
+%0A
     @Override%0A  

Add a public constructor to DefaultObjectFactory