Merge branch 'iambmelt/working' into collectionResponseFix

Brian Melton · Brian Melton · commit 8e157f31824b · 2016-07-15T14:36:53.000-07:00
diff --git a/Templates/ObjC/Base/SharedObjC.template.tt b/Templates/ObjC/Base/SharedObjC.template.tt
@@ -105,6 +105,13 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)
             expr);
     }
 
+    if(GetObjCTypeIdentifier(prop,true)=="MSTimeOfDay")
+    {
+        return String.Format(@"[{0} ms_timeFromString: {1}]",
+            GetObjCTypeIdentifier(prop,true),
+            expr);
+    }
+
     if(prop.IsEnum())
     {
         return String.Format(
@@ -241,7 +248,21 @@ private string GetStaticBaseObject()
 
 private string GeneratePropertyDeclarationLine(OdcmProperty prop)
 {
-    return "@property (nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+    if(prop.IsCollection || prop.IsComplex())
+    {
+        if(prop.IsNullable==true) 
+        {
+            return "@property (nullable, nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+        }
+        else
+        {
+            return "@property (nonnull, nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+        }
+    }
+    else
+    {
+        return "@property (nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+    }
 }
 
 private void PropertyGetterImplementation(OdcmProperty prop)
@@ -252,6 +273,17 @@ private void PropertyGetterImplementation(OdcmProperty prop)
 <#+
     if(IsObjCTypeSameAsJsonType(prop.Projection.Type))
     {
+#>
+<#+
+    if(prop.IsNullable==true) 
+    {
+#>
+    if([[NSNull null] isEqual:self.dictionary[@"<#=prop.Name#>"]])
+    {
+        return nil;
+    }   
+<#+
+}
 #>
     return self.dictionary[@"<#=prop.Name#>"];
 <#+
@@ -280,6 +312,7 @@ private void PropertyGetterImplementation(OdcmProperty prop)
     }
 #>
 }
+
 <#+
 }
 
@@ -304,6 +337,7 @@ private void PropertySetterImplementation(OdcmProperty prop)
     }
 #>
 }
+
 <#+
 }
 #>
diff --git a/Templates/ObjC/Models/ComplexType.h.tt b/Templates/ObjC/Models/ComplexType.h.tt
@@ -15,9 +15,9 @@ var baseEntity = entity.Base;
 <#
 foreach(var prop in entity.Properties.Where(prop => GetObjCTypeIdentifier(prop)!="NSStream" ))
 {
-	#>
-	<#=GeneratePropertyDeclarationLine(prop)#>
-	<#
+#>
+<#=GeneratePropertyDeclarationLine(prop)#>
+<#
 }
 
 #>
diff --git a/Templates/ObjC/Models/EntityType.h.tt b/Templates/ObjC/Models/EntityType.h.tt
@@ -17,7 +17,7 @@ IEnumerable<string> extraClasses = null;
 if (baseEntity == null)
 {
 #>
-  @property (nonatomic, setter=setODataType:, getter=oDataType) NSString *oDataType;
+  @property (nullable, nonatomic, setter=setODataType:, getter=oDataType) NSString *oDataType;
 <#
 }
 
diff --git a/Templates/ObjC/Models/EnumType.m.tt b/Templates/ObjC/Models/EnumType.m.tt
@@ -63,7 +63,7 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
     {
 #>
         case <#=GetObjCEnumMember(entity,member)#>:
-            return [<#=typeName#> <#=member.Name#>];
+            return [<#=typeName#> <#=member.Name.ToLowerFirstChar()#>];
 <#
     }
 #>
@@ -111,7 +111,7 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
     {
     #>if([self isEqualToString:@"<#=member.Name#>"])
     {
-          return [<#=typeName#> <#=member.Name#>];
+          return [<#=typeName#> <#=member.Name.ToLowerFirstChar()#>];
     }
     else <#
     }
diff --git a/Templates/ObjC/Models/Models.h.tt b/Templates/ObjC/Models/Models.h.tt
@@ -3,6 +3,7 @@
 <#@ include file="SharedObjC.template.tt"#>
 
 #import "MSDate.h"
+#import "MSTimeOfDay.h"
 <#		
 var enums = model.GetEnumTypes();
 foreach(var e in enums)
diff --git a/Templates/ObjC/Requests/EntityCollectionRequest.m.tt b/Templates/ObjC/Requests/EntityCollectionRequest.m.tt
@@ -48,7 +48,7 @@ if (innerEntityType.Equals(propName))
 - (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)getWithCompletion:(<#=propName+ collectionNamer#>CompletionHandler)completionHandler
 {
 
-    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask * task = [self collectionTaskWithRequest:[self get]
+    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask * sessionDataTask = [self collectionTaskWithRequest:[self get]
                                              odObjectWithDictionary:^(id response){
 <#
     if (prop.IsSystem())
@@ -74,8 +74,8 @@ if (innerEntityType.Equals(propName))
                                                 completionHandler(collectionResponse, nil, error);
                                             }
                                         }];
-    [task execute];
-    return task;
+    [sessionDataTask execute];
+    return sessionDataTask;
 }
 
 <#
@@ -117,13 +117,13 @@ if (innerEntityType.Equals(propName))
 
 - (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)add<#=innerEntity.Name.ToUpperFirstChar()#>:(<#=innerEntityType#>*)<#=innerEntity.Name.ToLowerFirstChar()#> withCompletion:(<#=innerEntityType#>CompletionHandler)completionHandler
 {
-    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *task = [self taskWithRequest:[self add<#=innerEntity.Name.ToUpperFirstChar()#>:<#=innerEntity.Name.ToLowerFirstChar()#>]
+    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *sessionDataTask = [self taskWithRequest:[self add<#=innerEntity.Name.ToUpperFirstChar()#>:<#=innerEntity.Name.ToLowerFirstChar()#>]
 							     odObjectWithDictionary:^(NSDictionary *response){
                                             return [[<#=innerEntityType#> alloc] initWithDictionary:response];
                                         }
                                               completion:completionHandler];
-    [task execute];
-    return task;
+    [sessionDataTask execute];
+    return sessionDataTask;
 }
 
 <#
diff --git a/Templates/ObjC/Requests/EntityRequest.m.tt b/Templates/ObjC/Requests/EntityRequest.m.tt
@@ -40,13 +40,13 @@ var entityName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + (withRefe
 
 - (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)getWithCompletion:<#=writer.GetNetworkCompletionBlock(writer.GetPrefix() + entity.Name.ToUpperFirstChar(), "response")#>completionHandler
 {
-    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *task = [self taskWithRequest:[self get]
+    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *sessionDataTask = [self taskWithRequest:[self get]
                                 odObjectWithDictionary:^(NSDictionary *response){
                                             return [[<#=writer.GetPrefix() + entity.Name.ToUpperFirstChar()#> alloc] initWithDictionary:response];
                                         }
                                              completion:completionHandler];
-    [task execute];
-    return task;
+    [sessionDataTask execute];
+    return sessionDataTask;
 }
 
 <# } #>
@@ -63,13 +63,13 @@ var entityName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + (withRefe
 
 - (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)update:(<#=writer.GetPrefix() + entity.Name.ToUpperFirstChar()#> *)<#=entity.Name#> withCompletion:<#=writer.GetNetworkCompletionBlock(writer.GetPrefix() + entity.Name.ToUpperFirstChar(), "response")#>completionHandler
 {
-    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *task = [self taskWithRequest:[self update:<#=entity.Name#>]
+    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *sessionDataTask = [self taskWithRequest:[self update:<#=entity.Name#>]
                                 odObjectWithDictionary:^(NSDictionary *response){
                                             return [[<#=writer.GetPrefix() + entity.Name.ToUpperFirstChar()#> alloc] initWithDictionary:response];
                                         }
                                               completion:completionHandler];
-    [task execute];
-    return task;
+    [sessionDataTask execute];
+    return sessionDataTask;
 }
 
 <# } #>
@@ -85,11 +85,11 @@ var entityName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + (withRefe
 
 - (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)deleteWithCompletion:<#=writer.GetNetworkCompletionBlock(null, null)#>completionHandler
 {
-    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *task = [self taskWithRequest:[self delete] completion:^(NSDictionary *response, NSError *error){
+    <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *sessionDataTask = [self taskWithRequest:[self delete] completion:^(NSDictionary *response, NSError *error){
                                                                     completionHandler(error);
                                                                  }];
-    [task execute];
-    return task;
+    [sessionDataTask execute];
+    return sessionDataTask;
 }
 
 <# } #>
diff --git a/Templates/ObjC/Requests/EntityRequestBuilder.h.tt b/Templates/ObjC/Requests/EntityRequestBuilder.h.tt
@@ -193,7 +193,8 @@ foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is Odc
 
 <#
 }
-foreach(var func in entity.Methods)
+
+foreach(var func in entity.MethodsAndOverloads())
 {
     var methodName = func.Name.Substring(func.Name.IndexOf('.') + 1).ToLowerFirstChar();
     var requestBuilderName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + methodName.ToUpperFirstChar() + "RequestBuilder";
@@ -204,8 +205,6 @@ foreach(var func in entity.Methods)
 #>
 - (<#=requestBuilderName#> *)<#=methodName#>;
 
-
-
 <#
 
 }
diff --git a/Templates/ObjC/Requests/EntityRequestBuilder.m.tt b/Templates/ObjC/Requests/EntityRequestBuilder.m.tt
@@ -115,7 +115,7 @@ foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is Odc
 
 }
 
-foreach(var func in entity.Methods)
+foreach(var func in entity.MethodsAndOverloads())
 {
     var methodName = func.Name.Substring(func.Name.IndexOf('.') + 1).ToLowerFirstChar();
     var requestBuilderName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + methodName.ToUpperFirstChar() + "RequestBuilder";
diff --git a/Templates/ObjC/Requests/ODataEntities.h.tt b/Templates/ObjC/Requests/ODataEntities.h.tt
@@ -93,22 +93,6 @@ foreach(var et in entityTypes)
 
 foreach(var complexType in model.GetComplexTypes())
 {
-    foreach(var prop in complexType.GetProperties().Where(prop => prop.IsCollection && !(prop.Projection.Type is OdcmPrimitiveType) && !prop.IsEnum() && !prop.LongDescriptionContains("ignorableCollection")))
-    {
-        var baseName = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar() + prop.Name.ToUpperFirstChar();
-        if(!prop.IsReference())
-        {
-            classes.Add("#import \"" + baseName + "CollectionRequestBuilder.h\"");
-            classes.Add("#import \"" + baseName + "CollectionRequest.h\"");
-        }
-        else
-        {
-            classes.Add("#import \"" + baseName + "CollectionWithReferencesRequestBuilder.h\"");
-            classes.Add("#import \"" + baseName + "CollectionWithReferencesRequest.h\"");
-            classes.Add("#import \"" + baseName + "CollectionReferenceRequestBuilder.h\"");
-            classes.Add("#import \"" + baseName + "CollectionReferenceRequest.h\"");
-        }
-    }
     foreach(var streamProperty in complexType.GetProperties(typeName:"Stream"))
     {
         classes.Add("#import \"" + writer.GetPrefix() + streamProperty.Class.Name.ToUpperFirstChar() + streamProperty.Name.ToUpperFirstChar() + "Request.h\"");
diff --git a/graphmeta_noannots.xml b/graphmeta_noannots.xml
diff --git a/graphmetadata2.xml b/graphmetadata2.xml
diff --git a/src/GraphODataTemplateWriter/CodeHelpers/ObjC/TypeHelperObjC.cs b/src/GraphODataTemplateWriter/CodeHelpers/ObjC/TypeHelperObjC.cs

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ var baseEntity = entity.Base;`
`15`	`15`	`<#`
`16`	`16`	`foreach(var prop in entity.Properties.Where(prop => GetObjCTypeIdentifier(prop)!="NSStream" ))`
`17`	`17`	`{`
`18`		`- #>`
`19`		`- <#=GeneratePropertyDeclarationLine(prop)#>`
`20`		`- <#`
	`18`	`+#>`
	`19`	`+<#=GeneratePropertyDeclarationLine(prop)#>`
	`20`	`+<#`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`#>`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ IEnumerable<string> extraClasses = null;`
`17`	`17`	`if (baseEntity == null)`
`18`	`18`	`{`
`19`	`19`	`#>`
`20`		`- @property (nonatomic, setter=setODataType:, getter=oDataType) NSString *oDataType;`
	`20`	`+ @property (nullable, nonatomic, setter=setODataType:, getter=oDataType) NSString *oDataType;`
`21`	`21`	`<#`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))`
`63`	`63`	`{`
`64`	`64`	`#>`
`65`	`65`	`case <#=GetObjCEnumMember(entity,member)#>:`
`66`		`- return [<#=typeName#> <#=member.Name#>];`
	`66`	`+ return [<#=typeName#> <#=member.Name.ToLowerFirstChar()#>];`
`67`	`67`	`<#`
`68`	`68`	`}`
`69`	`69`	`#>`
`@@ -111,7 +111,7 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))`
`111`	`111`	`{`
`112`	`112`	`#>if([self isEqualToString:@"<#=member.Name#>"])`
`113`	`113`	`{`
`114`		`- return [<#=typeName#> <#=member.Name#>];`
	`114`	`+ return [<#=typeName#> <#=member.Name.ToLowerFirstChar()#>];`
`115`	`115`	`}`
`116`	`116`	`else <#`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ if (innerEntityType.Equals(propName))`
`48`	`48`	`- (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)getWithCompletion:(<#=propName+ collectionNamer#>CompletionHandler)completionHandler`
`49`	`49`	`{`
`50`	`50`
`51`		`- <#=writer.GetStaticCodePrefix()#>URLSessionDataTask * task = [self collectionTaskWithRequest:[self get]`
	`51`	`+ <#=writer.GetStaticCodePrefix()#>URLSessionDataTask * sessionDataTask = [self collectionTaskWithRequest:[self get]`
`52`	`52`	`odObjectWithDictionary:^(id response){`
`53`	`53`	`<#`
`54`	`54`	`if (prop.IsSystem())`
`@@ -74,8 +74,8 @@ if (innerEntityType.Equals(propName))`
`74`	`74`	`completionHandler(collectionResponse, nil, error);`
`75`	`75`	`}`
`76`	`76`	`}];`
`77`		`- [task execute];`
`78`		`- return task;`
	`77`	`+ [sessionDataTask execute];`
	`78`	`+ return sessionDataTask;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`<#`
`@@ -117,13 +117,13 @@ if (innerEntityType.Equals(propName))`
`117`	`117`
`118`	`118`	`- (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask )add<#=innerEntity.Name.ToUpperFirstChar()#>:(<#=innerEntityType#>)<#=innerEntity.Name.ToLowerFirstChar()#> withCompletion:(<#=innerEntityType#>CompletionHandler)completionHandler`
`119`	`119`	`{`
`120`		`- <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *task = [self taskWithRequest:[self add<#=innerEntity.Name.ToUpperFirstChar()#>:<#=innerEntity.Name.ToLowerFirstChar()#>]`
	`120`	`+ <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *sessionDataTask = [self taskWithRequest:[self add<#=innerEntity.Name.ToUpperFirstChar()#>:<#=innerEntity.Name.ToLowerFirstChar()#>]`
`121`	`121`	`odObjectWithDictionary:^(NSDictionary *response){`
`122`	`122`	`return [[<#=innerEntityType#> alloc] initWithDictionary:response];`
`123`	`123`	`}`
`124`	`124`	`completion:completionHandler];`
`125`		`- [task execute];`
`126`		`- return task;`
	`125`	`+ [sessionDataTask execute];`
	`126`	`+ return sessionDataTask;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`<#`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,13 @@ var entityName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + (withRefe`
`40`	`40`
`41`	`41`	`- (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)getWithCompletion:<#=writer.GetNetworkCompletionBlock(writer.GetPrefix() + entity.Name.ToUpperFirstChar(), "response")#>completionHandler`
`42`	`42`	`{`
`43`		`- <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *task = [self taskWithRequest:[self get]`
	`43`	`+ <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *sessionDataTask = [self taskWithRequest:[self get]`
`44`	`44`	`odObjectWithDictionary:^(NSDictionary *response){`
`45`	`45`	`return [[<#=writer.GetPrefix() + entity.Name.ToUpperFirstChar()#> alloc] initWithDictionary:response];`
`46`	`46`	`}`
`47`	`47`	`completion:completionHandler];`
`48`		`- [task execute];`
`49`		`- return task;`
	`48`	`+ [sessionDataTask execute];`
	`49`	`+ return sessionDataTask;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`<# } #>`
`@@ -63,13 +63,13 @@ var entityName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + (withRefe`
`63`	`63`
`64`	`64`	`- (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask )update:(<#=writer.GetPrefix() + entity.Name.ToUpperFirstChar()#> )<#=entity.Name#> withCompletion:<#=writer.GetNetworkCompletionBlock(writer.GetPrefix() + entity.Name.ToUpperFirstChar(), "response")#>completionHandler`
`65`	`65`	`{`
`66`		`- <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *task = [self taskWithRequest:[self update:<#=entity.Name#>]`
	`66`	`+ <#=writer.GetStaticCodePrefix()#>URLSessionDataTask *sessionDataTask = [self taskWithRequest:[self update:<#=entity.Name#>]`
`67`	`67`	`odObjectWithDictionary:^(NSDictionary *response){`
`68`	`68`	`return [[<#=writer.GetPrefix() + entity.Name.ToUpperFirstChar()#> alloc] initWithDictionary:response];`
`69`	`69`	`}`
`70`	`70`	`completion:completionHandler];`
`71`		`- [task execute];`
`72`		`- return task;`
	`71`	`+ [sessionDataTask execute];`
	`72`	`+ return sessionDataTask;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`<# } #>`
`@@ -85,11 +85,11 @@ var entityName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + (withRefe`
`85`	`85`
`86`	`86`	`- (<#=writer.GetStaticCodePrefix()#>URLSessionDataTask *)deleteWithCompletion:<#=writer.GetNetworkCompletionBlock(null, null)#>completionHandler`
`87`	`87`	`{`
`88`		`- <#=writer.GetStaticCodePrefix()#>URLSessionDataTask task = [self taskWithRequest:[self delete] completion:^(NSDictionary response, NSError *error){`
	`88`	`+ <#=writer.GetStaticCodePrefix()#>URLSessionDataTask sessionDataTask = [self taskWithRequest:[self delete] completion:^(NSDictionary response, NSError *error){`
`89`	`89`	`completionHandler(error);`
`90`	`90`	`}];`
`91`		`- [task execute];`
`92`		`- return task;`
	`91`	`+ [sessionDataTask execute];`
	`92`	`+ return sessionDataTask;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`<# } #>`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,8 @@ foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is Odc`
`193`	`193`
`194`	`194`	`<#`
`195`	`195`	`}`
`196`		`-foreach(var func in entity.Methods)`
	`196`	`+`
	`197`	`+foreach(var func in entity.MethodsAndOverloads())`
`197`	`198`	`{`
`198`	`199`	`var methodName = func.Name.Substring(func.Name.IndexOf('.') + 1).ToLowerFirstChar();`
`199`	`200`	`var requestBuilderName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + methodName.ToUpperFirstChar() + "RequestBuilder";`
`@@ -204,8 +205,6 @@ foreach(var func in entity.Methods)`
`204`	`205`	`#>`
`205`	`206`	`- (<#=requestBuilderName#> *)<#=methodName#>;`
`206`	`207`
`207`		`-`
`208`		`-`
`209`	`208`	`<#`
`210`	`209`
`211`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is Odc`
`115`	`115`
`116`	`116`	`}`
`117`	`117`
`118`		`-foreach(var func in entity.Methods)`
	`118`	`+foreach(var func in entity.MethodsAndOverloads())`
`119`	`119`	`{`
`120`	`120`	`var methodName = func.Name.Substring(func.Name.IndexOf('.') + 1).ToLowerFirstChar();`
`121`	`121`	`var requestBuilderName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + methodName.ToUpperFirstChar() + "RequestBuilder";`