import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
-import static org.opendaylight.mdsal.binding.generator.util.TypeConstants.PATTERN_CONSTANT_NAME;
import static org.opendaylight.mdsal.binding.java.api.generator.GeneratorUtil.createImports;
+import static org.opendaylight.mdsal.binding.model.util.TypeConstants.PATTERN_CONSTANT_NAME;
import com.google.common.collect.ImmutableList;
import java.lang.reflect.Constructor;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.mdsal.binding.java.api.generator.GeneratorUtil;
import org.opendaylight.mdsal.binding.model.api.AnnotationType;
import org.opendaylight.mdsal.binding.model.api.Constant;
import org.opendaylight.mdsal.binding.model.api.GeneratedProperty;