529529 if(propertyName.StartsWith("Base"))
530530 {
531531 if(propertyName == "BaseItem" || propertyName == "BaseItemVersion")
532- return "models";
532+ return "models.extensions ";
533533 else
534- return "models";
534+ return "models.extensions ";
535535 }
536536
537- return "models";
537+ return "models.extensions ";
538538 }
539539
540540 //Getting import prefix using property name for Request classes
541541 public string getPrefixForRequests(string propertyName)
542542 {
543543 if(propertyName == "BaseItemCollectionPage")
544- return "requests";
544+ return "requests.extensions ";
545545
546546 if(propertyName.StartsWith("Base") || propertyName.StartsWith("IBase"))
547- return "requests";
547+ return "requests.extensions ";
548548
549- return "requests";
549+ return "requests.extensions ";
550550 }
551551
552552 //Get package prefix using OdcmProperty for model classes
555555 var propertyType = property.GetTypeString();
556556
557557 if(property.Type is OdcmEnum)
558- return "models";
558+ return "models.extensions ";
559559
560560 return getPrefixForModels(propertyType);
561561 }
566566 var propertyType = property.GetTypeString();
567567
568568 if(property.Type is OdcmEnum)
569- return "models";
569+ return "models.extensions ";
570570
571571 return getPrefixForModels(propertyType);
572572 }
589589 var importFormat = @"import {0}.{1}.{2};";
590590 sb.AppendFormat(importFormat,
591591 host.CurrentModel.NamespaceName(),
592- "models",
592+ "models.extensions ",
593593 TypeName(host.CurrentType));
594594 sb.Append("\n");
595595 return sb.ToString();
606606 {
607607 sb.AppendFormat(importFormat,
608608 host.CurrentModel.NamespaceName(),
609- "models",
609+ "models.extensions ",
610610 ReturnType(host.CurrentType));
611611 sb.Append("\n");
612612 }
613613
614614 sb.AppendFormat(importFormat,
615615 host.CurrentModel.NamespaceName(),
616- "requests",
616+ "requests.extensions ",
617617 ITypeRequest(host.CurrentType));
618618 sb.Append("\n");
619619 return sb.ToString();
626626 var importFormat = @"import {0}.{1}.{2};";
627627 sb.AppendFormat(importFormat,
628628 host.CurrentModel.NamespaceName(),
629- "models",
629+ "models.extensions ",
630630 TypeName(host.CurrentType.AsOdcmClass()));
631631 sb.Append("\n");
632632 return sb.ToString();
639639 var importFormat = @"import {0}.{1}.{2};";
640640 sb.AppendFormat(importFormat,
641641 host.CurrentModel.NamespaceName(),
642- "requests",
642+ "requests.extensions ",
643643 TypeRequest(host.CurrentType));
644644 sb.Append("\n");
645645 return sb.ToString();
652652 var importFormat = @"import {0}.{1}.{2};";
653653 sb.AppendFormat(importFormat,
654654 host.CurrentModel.NamespaceName(),
655- "requests",
655+ "requests.extensions ",
656656 ITypeRequest(host.CurrentType));
657657 sb.Append("\n");
658658
659659 sb.AppendFormat(importFormat,
660660 host.CurrentModel.NamespaceName(),
661- "requests",
661+ "requests.extensions ",
662662 TypeRequest(host.CurrentType));
663663 sb.Append("\n");
664664
693693 {
694694 sb.AppendFormat(importFormat,
695695 host.CurrentModel.NamespaceName(),
696- "models",
696+ "models.extensions ",
697697 ReturnType(host.CurrentType));
698698 sb.Append("\n");
699699 }
700700 if(host.CurrentType.AsOdcmMethod().IsCollection)
701701 {
702702 sb.AppendFormat(importFormat,
703703 host.CurrentModel.NamespaceName(),
704- "requests",
704+ "requests.extensions ",
705705 ITypeCollectionRequest(host.CurrentType));
706706 sb.Append("\n");
707707 }
708708 else
709709 {
710710 sb.AppendFormat(importFormat,
711711 host.CurrentModel.NamespaceName(),
712- "requests",
712+ "requests.extensions ",
713713 ITypeRequest(host.CurrentType));
714714 sb.Append("\n");
715715 }
725725
726726 sb.AppendFormat(importFormat,
727727 host.CurrentModel.NamespaceName(),
728- "models",
728+ "models.extensions ",
729729 TypeBody(host.CurrentType));
730730 sb.Append("\n");
731731 var returnType = ReturnType(host.CurrentType);
732732 if(returnType != "Void" && !(host.CurrentType.AsOdcmMethod().ReturnType is OdcmPrimitiveType))
733733 {
734734 sb.AppendFormat(importFormat,
735735 host.CurrentModel.NamespaceName(),
736- "models",
736+ "models.extensions ",
737737 ReturnType(host.CurrentType));
738738 sb.Append("\n");
739739 }
742742 {
743743 sb.AppendFormat(importFormat,
744744 host.CurrentModel.NamespaceName(),
745- "requests",
745+ "requests.extensions ",
746746 ITypeCollectionRequest(host.CurrentType));
747747 sb.Append("\n");
748748
749749 sb.AppendFormat(importFormat,
750750 host.CurrentModel.NamespaceName(),
751- "requests",
751+ "requests.extensions ",
752752 TypeCollectionRequest(host.CurrentType));
753753 sb.Append("\n");
754754 }
755755 else
756756 {
757757 sb.AppendFormat(importFormat,
758758 host.CurrentModel.NamespaceName(),
759- "requests",
759+ "requests.extensions ",
760760 ITypeRequest(host.CurrentType));
761761 sb.Append("\n");
762762
763763 sb.AppendFormat(importFormat,
764764 host.CurrentModel.NamespaceName(),
765- "requests",
765+ "requests.extensions ",
766766 TypeRequest(host.CurrentType));
767767 sb.Append("\n");
768768 }
776776 var importFormat = @"import {0}.{1}.{2};";
777777 sb.AppendFormat(importFormat,
778778 host.CurrentModel.NamespaceName(),
779- "requests",
779+ "requests.extensions ",
780780 ITypeRequest(host.CurrentType));
781781 sb.Append("\n");
782782 return sb.ToString();
797797
798798 sb.AppendFormat(importFormat,
799799 host.CurrentModel.NamespaceName(),
800- "models",
800+ "models.extensions ",
801801 modelClassName);
802802 sb.Append("\n");
803803 sb.AppendFormat(importFormat,
804804 host.CurrentModel.NamespaceName(),
805- "requests",
805+ "requests.extensions ",
806806 ITypeCollectionRequestBuilder(host.CurrentType));
807807
808808 return sb.ToString();
@@ -876,7 +876,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
876876 {
877877 string importstr= String.Format(importFormat,
878878 host.CurrentModel.NamespaceName(),
879- "models",
879+ "models.extensions ",
880880 "PlannerAssignment");
881881 if(!uniqueStore.ContainsKey(importstr)){
882882 uniqueStore.Add(importstr, 0);
@@ -888,7 +888,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
888888 {
889889 string importstr= String.Format(importFormat,
890890 host.CurrentModel.NamespaceName(),
891- "models",
891+ "models.extensions ",
892892 "PlannerChecklistItem");
893893 if(!uniqueStore.ContainsKey(importstr)){
894894 uniqueStore.Add(importstr, 0);
@@ -936,9 +936,9 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
936936
937937import {0}.concurrency.*;
938938import {0}.core.*;
939- import {0}.models.*;
939+ import {0}.models.extensions. *;
940940import {0}.http.*;
941- import {0}.requests.*;
941+ import {0}.requests.extensions. *;
942942import {0}.options.*;
943943import {0}.serializer.*;
944944
0 commit comments