Add relationship builder

braisdom · Sep 19, 2020 · 968c993 · 968c993
1 parent f67d70f
commit 968c993
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'com.github.braisdom'
-version '1.2.1'
+version '1.2.2'
 
 sourceCompatibility = 1.8
 
@@ -35,7 +35,7 @@ compileJava {
 
 apply plugin: 'org.jetbrains.intellij'
 intellij {
-    version = "2018.2"
+    version = "2019.1"
     type = 'IC'
     updateSinceUntilBuild = false
     downloadSources = true

diff --git a/src/main/java/com/github/braisdom/objsql/intellij/PersistenceMethodBuilder.java b/src/main/java/com/github/braisdom/objsql/intellij/PersistenceMethodBuilder.java
@@ -26,6 +26,8 @@ static void buildMethod(PsiClass psiClass, List result) {
         buildValidate(psiClass.getProject(), psiClass, result);
         buildExecute(psiClass.getProject(), psiClass, result);
         buildNewInstanceFrom(psiClass.getProject(), psiClass, result);
+        buildNewInstance2From(psiClass.getProject(), psiClass, result);
+        buildNewInstance3From(psiClass.getProject(), psiClass, result);
     }
 
     private static void buildCreatePersistence(Project project, PsiClass psiClass, List result) {
@@ -156,6 +158,30 @@ private static void buildNewInstanceFrom(Project project, PsiClass psiClass, Lis
         methodBuilder
                 .withParameter("properties", getProjectType("java.util.Map", project))
                 .withParameter("underLine", PsiType.BOOLEAN)
+                .withParameter("converter", getProjectType("com.github.braisdom.objsql.ForcedFieldValueConverter", project))
+                .withMethodReturnType(getProjectType(psiClass.getQualifiedName(), project))
+                .withContainingClass(psiClass)
+                .withModifier(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.FINAL);
+
+        result.add(methodBuilder);
+    }
+
+    private static void buildNewInstance2From(Project project, PsiClass psiClass, List result) {
+        ObjSqlLightMethodBuilder methodBuilder = new ObjSqlLightMethodBuilder(psiClass.getManager(), "newInstanceFrom");
+        methodBuilder
+                .withParameter("properties", getProjectType("java.util.Map", project))
+                .withParameter("underLine", PsiType.BOOLEAN)
+                .withMethodReturnType(getProjectType(psiClass.getQualifiedName(), project))
+                .withContainingClass(psiClass)
+                .withModifier(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.FINAL);
+
+        result.add(methodBuilder);
+    }
+
+    private static void buildNewInstance3From(Project project, PsiClass psiClass, List result) {
+        ObjSqlLightMethodBuilder methodBuilder = new ObjSqlLightMethodBuilder(psiClass.getManager(), "newInstanceFrom");
+        methodBuilder
+                .withParameter("properties", getProjectType("java.util.Map", project))
                 .withMethodReturnType(getProjectType(psiClass.getQualifiedName(), project))
                 .withContainingClass(psiClass)
                 .withModifier(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.FINAL);

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -2,8 +2,8 @@
     <id>com.github.braisdom.object-sql-intellij</id>
     <name>ObjectiveSql</name>
     <vendor email="[email protected]" url="http://www.objsql.com">ObjectiveSql</vendor>
-    <version>1.2</version>
-    <idea-version since-build="2018.2"/>
+    <version>1.2.2</version>
+    <idea-version since-build="191.1"/>
     <category>Tools Integration</category>
     <description><![CDATA[
         <p> Filling the generated elements for ObjectSql. Discuss, review, and share code with your