Skip to content

Commit 84fa17c

Browse files
zenginzengin
committed
GetNamespace()
1 parent 70d4efe commit 84fa17c

File tree

5 files changed

+60
-60
lines changed

5 files changed

+60
-60
lines changed

‎Templates/Java/BaseJavaModel.template.tt‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
var sb = new StringBuilder();
518518
var packageFormat = @"package {0}.{1};";
519519
sb.AppendFormat(packageFormat,
520-
host.CurrentModel.NamespaceName(),
520+
host.CurrentModel.GetNamespace(),
521521
host.TemplateInfo.OutputParentDirectory.Replace("_", "."));
522522
sb.Append("\n");
523523
return sb.ToString();
@@ -576,7 +576,7 @@
576576
var sb = new StringBuilder();
577577
var packageFormat = @"package {0}.{1};";
578578
sb.AppendFormat(packageFormat,
579-
host.CurrentModel.NamespaceName(),
579+
host.CurrentModel.GetNamespace(),
580580
host.TemplateInfo.OutputParentDirectory.Replace("_", "."));
581581
sb.Append("\n");
582582
return sb.ToString();
@@ -588,7 +588,7 @@
588588
sb.Append(CreatePackageDefinition(host));
589589
var importFormat = @"import {0}.{1}.{2};";
590590
sb.AppendFormat(importFormat,
591-
host.CurrentModel.NamespaceName(),
591+
host.CurrentModel.GetNamespace(),
592592
"models.extensions",
593593
TypeName(host.CurrentType));
594594
sb.Append("\n");
@@ -605,14 +605,14 @@
605605
if(returnType != "Void" && !(host.CurrentType.AsOdcmMethod().ReturnType is OdcmPrimitiveType))
606606
{
607607
sb.AppendFormat(importFormat,
608-
host.CurrentModel.NamespaceName(),
608+
host.CurrentModel.GetNamespace(),
609609
"models.extensions",
610610
ReturnType(host.CurrentType));
611611
sb.Append("\n");
612612
}
613613

614614
sb.AppendFormat(importFormat,
615-
host.CurrentModel.NamespaceName(),
615+
host.CurrentModel.GetNamespace(),
616616
"requests.extensions",
617617
ITypeRequest(host.CurrentType));
618618
sb.Append("\n");
@@ -625,7 +625,7 @@
625625
sb.Append(CreatePackageDefinition(host));
626626
var importFormat = @"import {0}.{1}.{2};";
627627
sb.AppendFormat(importFormat,
628-
host.CurrentModel.NamespaceName(),
628+
host.CurrentModel.GetNamespace(),
629629
"models.extensions",
630630
TypeName(host.CurrentType.AsOdcmClass()));
631631
sb.Append("\n");
@@ -638,7 +638,7 @@
638638
sb.Append(CreatePackageDefForIBaseMethodRequest(host));
639639
var importFormat = @"import {0}.{1}.{2};";
640640
sb.AppendFormat(importFormat,
641-
host.CurrentModel.NamespaceName(),
641+
host.CurrentModel.GetNamespace(),
642642
"requests.extensions",
643643
TypeRequest(host.CurrentType));
644644
sb.Append("\n");
@@ -651,13 +651,13 @@
651651
sb.Append(CreatePackageDefinition(host));
652652
var importFormat = @"import {0}.{1}.{2};";
653653
sb.AppendFormat(importFormat,
654-
host.CurrentModel.NamespaceName(),
654+
host.CurrentModel.GetNamespace(),
655655
"requests.extensions",
656656
ITypeRequest(host.CurrentType));
657657
sb.Append("\n");
658658

659659
sb.AppendFormat(importFormat,
660-
host.CurrentModel.NamespaceName(),
660+
host.CurrentModel.GetNamespace(),
661661
"requests.extensions",
662662
TypeRequest(host.CurrentType));
663663
sb.Append("\n");
@@ -673,7 +673,7 @@
673673
}
674674

675675
sb.AppendFormat(importFormat,
676-
host.CurrentModel.NamespaceName(),
676+
host.CurrentModel.GetNamespace(),
677677
getPackagePrefix(p),
678678
propertyType);
679679
sb.Append("\n");
@@ -692,23 +692,23 @@
692692
if(returnType != "Void" && !(host.CurrentType.AsOdcmMethod().ReturnType is OdcmPrimitiveType))
693693
{
694694
sb.AppendFormat(importFormat,
695-
host.CurrentModel.NamespaceName(),
695+
host.CurrentModel.GetNamespace(),
696696
"models.extensions",
697697
ReturnType(host.CurrentType));
698698
sb.Append("\n");
699699
}
700700
if(host.CurrentType.AsOdcmMethod().IsCollection)
701701
{
702702
sb.AppendFormat(importFormat,
703-
host.CurrentModel.NamespaceName(),
703+
host.CurrentModel.GetNamespace(),
704704
"requests.extensions",
705705
ITypeCollectionRequest(host.CurrentType));
706706
sb.Append("\n");
707707
}
708708
else
709709
{
710710
sb.AppendFormat(importFormat,
711-
host.CurrentModel.NamespaceName(),
711+
host.CurrentModel.GetNamespace(),
712712
"requests.extensions",
713713
ITypeRequest(host.CurrentType));
714714
sb.Append("\n");
@@ -724,15 +724,15 @@
724724
var importFormat = @"import {0}.{1}.{2};";
725725

726726
sb.AppendFormat(importFormat,
727-
host.CurrentModel.NamespaceName(),
727+
host.CurrentModel.GetNamespace(),
728728
"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,
735-
host.CurrentModel.NamespaceName(),
735+
host.CurrentModel.GetNamespace(),
736736
"models.extensions",
737737
ReturnType(host.CurrentType));
738738
sb.Append("\n");
@@ -741,27 +741,27 @@
741741
if(host.CurrentType.AsOdcmMethod().IsCollection)
742742
{
743743
sb.AppendFormat(importFormat,
744-
host.CurrentModel.NamespaceName(),
744+
host.CurrentModel.GetNamespace(),
745745
"requests.extensions",
746746
ITypeCollectionRequest(host.CurrentType));
747747
sb.Append("\n");
748748

749749
sb.AppendFormat(importFormat,
750-
host.CurrentModel.NamespaceName(),
750+
host.CurrentModel.GetNamespace(),
751751
"requests.extensions",
752752
TypeCollectionRequest(host.CurrentType));
753753
sb.Append("\n");
754754
}
755755
else
756756
{
757757
sb.AppendFormat(importFormat,
758-
host.CurrentModel.NamespaceName(),
758+
host.CurrentModel.GetNamespace(),
759759
"requests.extensions",
760760
ITypeRequest(host.CurrentType));
761761
sb.Append("\n");
762762

763763
sb.AppendFormat(importFormat,
764-
host.CurrentModel.NamespaceName(),
764+
host.CurrentModel.GetNamespace(),
765765
"requests.extensions",
766766
TypeRequest(host.CurrentType));
767767
sb.Append("\n");
@@ -775,7 +775,7 @@
775775
sb.Append(CreatePackageDefinition(host));
776776
var importFormat = @"import {0}.{1}.{2};";
777777
sb.AppendFormat(importFormat,
778-
host.CurrentModel.NamespaceName(),
778+
host.CurrentModel.GetNamespace(),
779779
"requests.extensions",
780780
ITypeRequest(host.CurrentType));
781781
sb.Append("\n");
@@ -796,12 +796,12 @@
796796

797797

798798
sb.AppendFormat(importFormat,
799-
host.CurrentModel.NamespaceName(),
799+
host.CurrentModel.GetNamespace(),
800800
"models.extensions",
801801
modelClassName);
802802
sb.Append("\n");
803803
sb.AppendFormat(importFormat,
804-
host.CurrentModel.NamespaceName(),
804+
host.CurrentModel.GetNamespace(),
805805
"requests.extensions",
806806
ITypeCollectionRequestBuilder(host.CurrentType));
807807

@@ -815,7 +815,7 @@
815815
var sb = new StringBuilder();
816816
var packageFormat = @"package {0}.{1};";
817817
sb.AppendFormat(packageFormat,
818-
host.CurrentModel.NamespaceName(),
818+
host.CurrentModel.GetNamespace(),
819819
host.TemplateInfo.OutputParentDirectory.Replace("_", "."));
820820
sb.Append("\n");
821821

@@ -825,7 +825,7 @@ import {0}.http.*;
825825
import {0}.options.*;
826826
import {0}.serializer.*;
827827
import java.util.Arrays;
828-
import java.util.EnumSet;", host.CurrentModel.NamespaceName());
828+
import java.util.EnumSet;", host.CurrentModel.GetNamespace());
829829

830830
sb.Append("\n");
831831
var importFormat = @"import {0}.{1}.{2};";
@@ -845,7 +845,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
845845

846846
string prefixValue = getPackagePrefix(property);
847847
string importstr= String.Format(importFormat,
848-
host.CurrentModel.NamespaceName(),
848+
host.CurrentModel.GetNamespace(),
849849
prefixValue,
850850
propertyType);
851851
if(!uniqueStore.ContainsKey(importstr)){
@@ -861,7 +861,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
861861
{
862862
string prefixValue = getPrefixForModels(baseClassNameType);
863863
string importstr= String.Format(importFormat,
864-
host.CurrentModel.NamespaceName(),
864+
host.CurrentModel.GetNamespace(),
865865
prefixValue,
866866
baseClassNameType);
867867
if(!uniqueStore.ContainsKey(importstr)){
@@ -875,7 +875,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
875875
if(baseTypeNameStr == "BasePlannerAssignments")
876876
{
877877
string importstr= String.Format(importFormat,
878-
host.CurrentModel.NamespaceName(),
878+
host.CurrentModel.GetNamespace(),
879879
"models.extensions",
880880
"PlannerAssignment");
881881
if(!uniqueStore.ContainsKey(importstr)){
@@ -887,7 +887,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
887887
if(baseTypeNameStr == "BasePlannerChecklistItems")
888888
{
889889
string importstr= String.Format(importFormat,
890-
host.CurrentModel.NamespaceName(),
890+
host.CurrentModel.GetNamespace(),
891891
"models.extensions",
892892
"PlannerChecklistItem");
893893
if(!uniqueStore.ContainsKey(importstr)){
@@ -906,7 +906,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
906906

907907
var propertyType = TypeCollectionResponse(property);
908908
string importstr= String.Format(importFormat,
909-
host.CurrentModel.NamespaceName(),
909+
host.CurrentModel.GetNamespace(),
910910
getPrefixForRequests(propertyType),
911911
propertyType);
912912
if(!uniqueStore.ContainsKey(importstr)){
@@ -917,7 +917,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
917917

918918
string propertyValue = TypeCollectionPage(property);
919919
string importstr1= String.Format(importFormat,
920-
host.CurrentModel.NamespaceName(),
920+
host.CurrentModel.GetNamespace(),
921921
getPrefixForRequests(propertyValue),
922922
propertyValue);
923923
if(!uniqueStore.ContainsKey(importstr1)){
@@ -950,7 +950,7 @@ import java.util.EnumSet;";
950950
string fullyQualifiedImport = host.GetFullyQualifiedImportStatementForModel();
951951

952952
return string.Format(format,
953-
host.CurrentModel.NamespaceName(),
953+
host.CurrentModel.GetNamespace(),
954954
host.TemplateInfo.OutputParentDirectory.Replace("_", "."), fullyQualifiedImport);
955955
}
956956

‎Templates/Java/requests_extensions/BaseEntityRequest.java.tt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,19 @@ classDeclaration += TypeName(c);
236236
sb.Append(CreatePackageDefinition(host));
237237
var importFormat = @"import {0}.{1}.{2};";
238238
sb.AppendFormat(importFormat,
239-
host.CurrentModel.NamespaceName(),
239+
host.CurrentModel.GetNamespace(),
240240
"requests.extensions",
241241
ITypeRequest(host.CurrentType));
242242
sb.Append("\n");
243243

244244
sb.AppendFormat(importFormat,
245-
host.CurrentModel.NamespaceName(),
245+
host.CurrentModel.GetNamespace(),
246246
"requests.extensions",
247247
TypeRequest(host.CurrentType));
248248
sb.Append("\n");
249249

250250
sb.AppendFormat(importFormat,
251-
host.CurrentModel.NamespaceName(),
251+
host.CurrentModel.GetNamespace(),
252252
"models.extensions",
253253
TypeName(host.CurrentType.AsOdcmClass()));
254254
sb.Append("\n");

0 commit comments

Comments
 (0)