Skip to content

Commit c5bf2a4

Browse files
author
Nakul Sabharwal
committed
Java extension templates removal, generated template edits and restructure of folders.
1 parent c6badfd commit c5bf2a4

File tree

98 files changed

+749
-1008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+749
-1008
lines changed

‎Templates/Java/BaseJavaModel.template.tt‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -525,24 +525,24 @@
525525
if(propertyName.StartsWith("Base"))
526526
{
527527
if(propertyName == "BaseItem" || propertyName == "BaseItemVersion")
528-
return "models.extensions";
528+
return "models";
529529
else
530-
return "models.generated";
530+
return "models";
531531
}
532532

533-
return "models.extensions";
533+
return "models";
534534
}
535535

536536
//Getting import prefix using property name for Request classes
537537
public string getPrefixForRequests(string propertyName)
538538
{
539539
if(propertyName == "BaseItemCollectionPage")
540-
return "requests.extensions";
540+
return "requests";
541541

542542
if(propertyName.StartsWith("Base") || propertyName.StartsWith("IBase"))
543-
return "requests.generated";
543+
return "requests";
544544

545-
return "requests.extensions";
545+
return "requests";
546546
}
547547

548548
//Get package prefix using OdcmProperty for model classes
@@ -551,7 +551,7 @@
551551
var propertyType = property.GetTypeString();
552552

553553
if(property.Type is OdcmEnum)
554-
return "models.generated";
554+
return "models";
555555

556556
return getPrefixForModels(propertyType);
557557
}
@@ -562,7 +562,7 @@
562562
var propertyType = property.GetTypeString();
563563

564564
if(property.Type is OdcmEnum)
565-
return "models.generated";
565+
return "models";
566566

567567
return getPrefixForModels(propertyType);
568568
}
@@ -585,7 +585,7 @@
585585
var importFormat = @"import {0}.{1}.{2};";
586586
sb.AppendFormat(importFormat,
587587
host.CurrentModel.NamespaceName(),
588-
"models.extensions",
588+
"models",
589589
TypeName(host.CurrentType));
590590
sb.Append("\n");
591591
return sb.ToString();
@@ -602,14 +602,14 @@
602602
{
603603
sb.AppendFormat(importFormat,
604604
host.CurrentModel.NamespaceName(),
605-
"models.extensions",
605+
"models",
606606
ReturnType(host.CurrentType));
607607
sb.Append("\n");
608608
}
609609

610610
sb.AppendFormat(importFormat,
611611
host.CurrentModel.NamespaceName(),
612-
"requests.extensions",
612+
"requests",
613613
ITypeRequest(host.CurrentType));
614614
sb.Append("\n");
615615
return sb.ToString();
@@ -622,7 +622,7 @@
622622
var importFormat = @"import {0}.{1}.{2};";
623623
sb.AppendFormat(importFormat,
624624
host.CurrentModel.NamespaceName(),
625-
"models.extensions",
625+
"models",
626626
TypeName(host.CurrentType.AsOdcmClass()));
627627
sb.Append("\n");
628628
return sb.ToString();
@@ -635,7 +635,7 @@
635635
var importFormat = @"import {0}.{1}.{2};";
636636
sb.AppendFormat(importFormat,
637637
host.CurrentModel.NamespaceName(),
638-
"requests.extensions",
638+
"requests",
639639
TypeRequest(host.CurrentType));
640640
sb.Append("\n");
641641
return sb.ToString();
@@ -648,13 +648,13 @@
648648
var importFormat = @"import {0}.{1}.{2};";
649649
sb.AppendFormat(importFormat,
650650
host.CurrentModel.NamespaceName(),
651-
"requests.extensions",
651+
"requests",
652652
ITypeRequest(host.CurrentType));
653653
sb.Append("\n");
654654

655655
sb.AppendFormat(importFormat,
656656
host.CurrentModel.NamespaceName(),
657-
"requests.extensions",
657+
"requests",
658658
TypeRequest(host.CurrentType));
659659
sb.Append("\n");
660660

@@ -683,23 +683,23 @@
683683
{
684684
sb.AppendFormat(importFormat,
685685
host.CurrentModel.NamespaceName(),
686-
"models.extensions",
686+
"models",
687687
ReturnType(host.CurrentType));
688688
sb.Append("\n");
689689
}
690690
if(host.CurrentType.AsOdcmMethod().IsCollection)
691691
{
692692
sb.AppendFormat(importFormat,
693693
host.CurrentModel.NamespaceName(),
694-
"requests.extensions",
694+
"requests",
695695
ITypeCollectionRequest(host.CurrentType));
696696
sb.Append("\n");
697697
}
698698
else
699699
{
700700
sb.AppendFormat(importFormat,
701701
host.CurrentModel.NamespaceName(),
702-
"requests.extensions",
702+
"requests",
703703
ITypeRequest(host.CurrentType));
704704
sb.Append("\n");
705705
}
@@ -715,15 +715,15 @@
715715

716716
sb.AppendFormat(importFormat,
717717
host.CurrentModel.NamespaceName(),
718-
"models.extensions",
718+
"models",
719719
TypeBody(host.CurrentType));
720720
sb.Append("\n");
721721
var returnType = ReturnType(host.CurrentType);
722722
if(returnType != "Void" && !(host.CurrentType.AsOdcmMethod().ReturnType is OdcmPrimitiveType))
723723
{
724724
sb.AppendFormat(importFormat,
725725
host.CurrentModel.NamespaceName(),
726-
"models.extensions",
726+
"models",
727727
ReturnType(host.CurrentType));
728728
sb.Append("\n");
729729
}
@@ -732,27 +732,27 @@
732732
{
733733
sb.AppendFormat(importFormat,
734734
host.CurrentModel.NamespaceName(),
735-
"requests.extensions",
735+
"requests",
736736
ITypeCollectionRequest(host.CurrentType));
737737
sb.Append("\n");
738738

739739
sb.AppendFormat(importFormat,
740740
host.CurrentModel.NamespaceName(),
741-
"requests.extensions",
741+
"requests",
742742
TypeCollectionRequest(host.CurrentType));
743743
sb.Append("\n");
744744
}
745745
else
746746
{
747747
sb.AppendFormat(importFormat,
748748
host.CurrentModel.NamespaceName(),
749-
"requests.extensions",
749+
"requests",
750750
ITypeRequest(host.CurrentType));
751751
sb.Append("\n");
752752

753753
sb.AppendFormat(importFormat,
754754
host.CurrentModel.NamespaceName(),
755-
"requests.extensions",
755+
"requests",
756756
TypeRequest(host.CurrentType));
757757
sb.Append("\n");
758758
}
@@ -766,7 +766,7 @@
766766
var importFormat = @"import {0}.{1}.{2};";
767767
sb.AppendFormat(importFormat,
768768
host.CurrentModel.NamespaceName(),
769-
"requests.extensions",
769+
"requests",
770770
ITypeRequest(host.CurrentType));
771771
sb.Append("\n");
772772
return sb.ToString();
@@ -787,12 +787,12 @@
787787

788788
sb.AppendFormat(importFormat,
789789
host.CurrentModel.NamespaceName(),
790-
"models.extensions",
790+
"models",
791791
modelClassName);
792792
sb.Append("\n");
793793
sb.AppendFormat(importFormat,
794794
host.CurrentModel.NamespaceName(),
795-
"requests.extensions",
795+
"requests",
796796
ITypeCollectionRequestBuilder(host.CurrentType));
797797

798798
return sb.ToString();
@@ -866,7 +866,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
866866
{
867867
string importstr= String.Format(importFormat,
868868
host.CurrentModel.NamespaceName(),
869-
"models.extensions",
869+
"models",
870870
"PlannerAssignment");
871871
if(!uniqueStore.ContainsKey(importstr)){
872872
uniqueStore.Add(importstr, 0);
@@ -878,7 +878,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
878878
{
879879
string importstr= String.Format(importFormat,
880880
host.CurrentModel.NamespaceName(),
881-
"models.extensions",
881+
"models",
882882
"PlannerChecklistItem");
883883
if(!uniqueStore.ContainsKey(importstr)){
884884
uniqueStore.Add(importstr, 0);
@@ -926,11 +926,9 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
926926

927927
import {0}.concurrency.*;
928928
import {0}.core.*;
929-
import {0}.models.extensions.*;
930-
import {0}.models.generated.*;
929+
import {0}.models.*;
931930
import {0}.http.*;
932-
import {0}.requests.extensions.*;
933-
import {0}.requests.generated.*;
931+
import {0}.requests.*;
934932
import {0}.options.*;
935933
import {0}.serializer.*;
936934

0 commit comments

Comments
 (0)