From b09ca3de28f41e77cd190cc379d61bebe4a938bd Mon Sep 17 00:00:00 2001 From: tsantalis Date: Fri, 22 Nov 2024 20:24:50 -0500 Subject: [PATCH] Variable oracle update --- ...-convertIfNecessary-conversionService.json | 12 +++++----- ...ate-convertIfNecessary-convertedValue.json | 12 +++++----- ...terDelegate-convertIfNecessary-editor.json | 12 +++++----- ...erterDelegate-convertIfNecessary-ex-1.json | 12 +++++----- ...erterDelegate-convertIfNecessary-ex-2.json | 12 +++++----- ...verterDelegate-convertIfNecessary-msg.json | 23 +++++-------------- ...rDelegate-convertIfNecessary-newValue.json | 12 +++++----- ...rDelegate-convertIfNecessary-oldValue.json | 12 +++++----- ...egate-convertIfNecessary-propertyName.json | 12 +++++----- ...egate-convertIfNecessary-requiredType.json | 23 +++++-------------- ...ate-convertIfNecessary-sourceTypeDesc.json | 12 +++++----- ...erDelegate-convertIfNecessary-strCtor.json | 12 +++++----- ...egate-convertIfNecessary-trimmedValue.json | 23 +++++-------------- .../resources/variable/training-expected.txt | 6 ++--- 14 files changed, 81 insertions(+), 114 deletions(-) diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-conversionService.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-conversionService.json index e948f628155..b058eab8ca9 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-conversionService.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-conversionService.json @@ -11,15 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "e9823b57b4ff5a8a0b82e56b5720a96b5e5bbbd3", - "commitId": "45a0cadf8e7fc5cc082c11ef03f77dc017af64c4", - "commitTime": 1249778809, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$conversionService:ConversionService(166)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$conversionService:ConversionService(195)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$conversionService:ConversionService(166)", - "comment": "new variable" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$conversionService:ConversionService(195)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-convertedValue.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-convertedValue.json index f2f36e8eb71..11663261d20 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-convertedValue.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-convertedValue.json @@ -11,15 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$convertedValue:Object(163)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$convertedValue:Object(189)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$convertedValue:Object(163)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$convertedValue:Object(189)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-editor.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-editor.json index d527a3593c3..54eb8132f1d 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-editor.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-editor.json @@ -11,15 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$editor:PropertyEditor(166)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$editor:PropertyEditor(192)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$editor:PropertyEditor(166)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$editor:PropertyEditor(192)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-1.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-1.json index 35c2bf2559c..e5f6248baa0 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-1.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-1.json @@ -11,15 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "9f9f2349cd6cffc0633b83ab9ea284bd7a8ae47f", - "commitId": "fee838a65e87f5da4b65b04ea5101681d6308104", - "commitTime": 1251120642, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$ex:NoSuchMethodException(211)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$ex:NoSuchMethodException(242)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$ex:NoSuchMethodException(211)", - "comment": "new variable" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$ex:NoSuchMethodException(242)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-2.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-2.json index a181f73908d..dad32f39e6e 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-2.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-ex-2.json @@ -11,15 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "427edfe93cf1649c85ae04757bd16230262e756c", - "commitId": "04b619ebfbc1e08a9e9bdc54263b3ece21f4aa7f", - "commitTime": 1251121701, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$ex:Exception(217)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$ex:Exception(248)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$ex:Exception(217)", - "comment": "new variable" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$ex:Exception(248)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-msg.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-msg.json index b1dd671eac5..9f2fd3ac264 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-msg.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-msg.json @@ -11,26 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "369821dd66fab964df6193f8f1afe5a334a30dfc", - "commitId": "347f34c68a7a5bab46cf869e762fb3cee9a1fedc", - "commitTime": 1227147053, - "changeType": "type change", - "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$msg:StringBuffer(219)", - "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$msg:StringBuilder(213)", - "comment": "Change Variable Type msg : StringBuffer to msg : StringBuilder in method protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : Object from class org.springframework.beans.TypeConverterDelegate" - }, - { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$msg:StringBuffer(219)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$msg:StringBuilder(266)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$msg:StringBuffer(219)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$msg:StringBuilder(266)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-newValue.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-newValue.json index fe2af6e4076..2f195dd1397 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-newValue.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-newValue.json @@ -22,15 +22,15 @@ "comment": "Add Parameter Annotation @Nullable in parameter newValue : Object in method public convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T from class org.springframework.beans.TypeConverterDelegate" }, { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$newValue:Object(159)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$newValue:Object(186)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$newValue:Object(159)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$newValue:Object(186)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-oldValue.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-oldValue.json index 20ec83438aa..e93c5fdcd4a 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-oldValue.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-oldValue.json @@ -22,15 +22,15 @@ "comment": "Add Parameter Annotation @Nullable in parameter oldValue : Object in method public convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T from class org.springframework.beans.TypeConverterDelegate" }, { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$oldValue:Object(159)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$oldValue:Object(186)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$oldValue:Object(159)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$oldValue:Object(186)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-propertyName.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-propertyName.json index b7ad257ed3a..a6eaf8b624d 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-propertyName.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-propertyName.json @@ -22,15 +22,15 @@ "comment": "Add Parameter Annotation @Nullable in parameter propertyName : String in method public convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T from class org.springframework.beans.TypeConverterDelegate" }, { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$propertyName:String(159)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$propertyName:String(186)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$propertyName:String(159)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$propertyName:String(186)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-requiredType.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-requiredType.json index 01a1102bbf7..1a1000cead4 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-requiredType.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-requiredType.json @@ -22,26 +22,15 @@ "comment": "Add Parameter Annotation @Nullable in parameter requiredType : Class in method public convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T from class org.springframework.beans.TypeConverterDelegate" }, { - "parentCommitId": "b72af54f53047c65c7e4a5094c9f2a15df1f57ef", - "commitId": "0297116542a3ce33d19a6a81b8240097081376c5", - "commitTime": 1242081873, - "changeType": "type change", - "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$requiredType:Class(153)", - "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$requiredType:Class(154)", - "comment": "Change Parameter Type requiredType : Class to requiredType : Class in method protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T from class org.springframework.beans.TypeConverterDelegate" - }, - { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$requiredType:Class(159)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$requiredType:Class(187)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$requiredType:Class(159)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$requiredType:Class(187)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-sourceTypeDesc.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-sourceTypeDesc.json index 28808f9a92a..e2284fe2662 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-sourceTypeDesc.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-sourceTypeDesc.json @@ -11,15 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "b2e38379566cf788421bd387d1c5ea243692f448", - "commitId": "45c542e51e9b01526a97a1644aebfe1e94a2342f", - "commitTime": 1253305961, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$sourceTypeDesc:TypeDescriptor(169)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$sourceTypeDesc:TypeDescriptor(197)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$sourceTypeDesc:TypeDescriptor(169)", - "comment": "Extract Variable sourceTypeDesc : TypeDescriptor in method protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T from class org.springframework.beans.TypeConverterDelegate" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$sourceTypeDesc:TypeDescriptor(197)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-strCtor.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-strCtor.json index 1734669ceed..b8abc7ab690 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-strCtor.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-strCtor.json @@ -22,15 +22,15 @@ "comment": "Change Variable Type strCtor : Constructor to strCtor : Constructor in method public convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T from class org.springframework.beans.TypeConverterDelegate" }, { - "parentCommitId": "9f9f2349cd6cffc0633b83ab9ea284bd7a8ae47f", - "commitId": "fee838a65e87f5da4b65b04ea5101681d6308104", - "commitTime": 1251120642, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$strCtor:Constructor(208)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$strCtor:Constructor(239)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$strCtor:Constructor(208)", - "comment": "new variable" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$strCtor:Constructor(239)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-trimmedValue.json b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-trimmedValue.json index ce2952b2002..9b7db212ee5 100644 --- a/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-trimmedValue.json +++ b/src/main/resources/oracle/variable/training/spring-framework-TypeConverterDelegate-convertIfNecessary-trimmedValue.json @@ -11,26 +11,15 @@ "startCommitId": "b325c74216fd9564a36602158fa1269e2e832874", "expectedChanges": [ { - "parentCommitId": "9f9f2349cd6cffc0633b83ab9ea284bd7a8ae47f", - "commitId": "fee838a65e87f5da4b65b04ea5101681d6308104", - "commitTime": 1251120642, - "changeType": "rename", - "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$strValue:String(206)", - "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$trimmedValue:String(217)", - "comment": "Rename Variable strValue : String to trimmedValue : String in method protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T from class org.springframework.beans.TypeConverterDelegate" - }, - { - "parentCommitId": "684a4f28c242c7161fb1d8305cf0e3c22def57ab", - "commitId": "f11d3436ed21d3908b9e0b569f2d783df161c0a3", - "commitTime": 1224692017, + "parentCommitId": "973fb6ce4096d344758b3e0988e90ab401275209", + "commitId": "ac490114aee005a66eeb0fba6c3c853552fc6a94", + "commitTime": 1259286194, "changeType": "introduced", "elementFileBefore": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$strValue:String(197)", + "elementNameBefore": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$trimmedValue:String(254)", "elementFileAfter": "org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java", - "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, PropertyDescriptor, MethodParameter)$strValue:String(197)", - "comment": "added with method" + "elementNameAfter": "org.springframework.beans/src/main/java/org.springframework.beans.TypeConverterDelegate#convertIfNecessary(String, Object, Object, Class, TypeDescriptor)$trimmedValue:String(254)", + "comment": "Extract Method private convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, typeDescriptor TypeDescriptor) : T extracted from protected convertIfNecessary(propertyName String, oldValue Object, newValue Object, requiredType Class, descriptor PropertyDescriptor, methodParam MethodParameter) : T in class org.springframework.beans.TypeConverterDelegate" } ] } \ No newline at end of file diff --git a/src/test/resources/variable/training-expected.txt b/src/test/resources/variable/training-expected.txt index 0cf53262418..5e2ed2bea94 100644 --- a/src/test/resources/variable/training-expected.txt +++ b/src/test/resources/variable/training-expected.txt @@ -1012,14 +1012,14 @@ spring-framework-TypeConverterDelegate-convertIfNecessary-elementTypeDesc.json, spring-framework-TypeConverterDelegate-convertIfNecessary-ex-1.json, 1, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-ex-2.json, 1, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-ex.json, 1, 0, 0 -spring-framework-TypeConverterDelegate-convertIfNecessary-msg.json, 2, 0, 0 +spring-framework-TypeConverterDelegate-convertIfNecessary-msg.json, 1, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-newValue.json, 2, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-oldValue.json, 2, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-propertyName.json, 2, 0, 0 -spring-framework-TypeConverterDelegate-convertIfNecessary-requiredType.json, 3, 0, 0 +spring-framework-TypeConverterDelegate-convertIfNecessary-requiredType.json, 2, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-sourceTypeDesc-1.json, 1, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-sourceTypeDesc.json, 1, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-standardConversion.json, 1, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-strCtor.json, 2, 0, 0 -spring-framework-TypeConverterDelegate-convertIfNecessary-trimmedValue.json, 2, 0, 0 +spring-framework-TypeConverterDelegate-convertIfNecessary-trimmedValue.json, 1, 0, 0 spring-framework-TypeConverterDelegate-convertIfNecessary-typeDescriptor.json, 2, 0, 0 \ No newline at end of file