Examples of ER Diagram added

payara · Jun 20, 2024 · 1e5a0c0 · 1e5a0c0
1 parent 101645e
commit 1e5a0c0
Show file tree

Hide file tree

Showing 32 changed files with 1,136 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@
 /starter-archetype/src/main/resources/archetype-resources/.gradle
 /starter-ui/payara-starter-ui.iml
 /PayaraStarterGenerator/target/
+starter-ui/nb-configuration.xml
+starter-ui/nb-configuration.xml
diff --git a/PayaraStarterGenerator/pom.xml b/PayaraStarterGenerator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fish.payara.starter</groupId>
         <artifactId>payara-starter-parent</artifactId>
-        <version>1.0-beta7</version>
+        <version>1.0-beta8</version>
     </parent>
     <artifactId>payara-starter-generator</artifactId>
     <name>Payara Starter Generator</name>
@@ -17,4 +17,17 @@
             <type>jar</type>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <release>17</release>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Attribute.java b/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Attribute.java
@@ -113,6 +113,23 @@ public String getProperty(String key) {
         }
         return null;
     }
+
+        public String getProperty(String key, String defaultValue) {
+        for (KeyValue keyValue : property) {
+            if (keyValue.getKey().equals(key)) {
+                return keyValue.getValue() == null ? defaultValue : keyValue.getValue();
+            }
+        }
+        return defaultValue;
+    }
+
+    public String getToolTipText() {
+        return getProperty("tooltip", "");
+    }
+
+    public boolean isToolTip() {
+        return !getToolTipText().trim().isEmpty();
+    }
 
     public List<String> getImports() {
         return _import;

diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/ERModel.java b/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/ERModel.java
@@ -20,13 +20,14 @@
  * @author Gaurav Gupta
  */
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ERModel {
 
     private final List<Entity> entities = new ArrayList<>();
     private final List<Relationship> relationships = new ArrayList<>();
-    private List<KeyValue> property;
+    private List<KeyValue> property = Collections.EMPTY_LIST;
 
     public void addEntity(Entity entity) {
         entities.add(entity);

diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Entity.java b/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Entity.java
@@ -58,7 +58,7 @@ public String getLowerCasePluralizeName() {
     }
 
     public String getTitleCasePluralizeName() {
-        return pluralize(titleCase(name));
+        return getProperty("title", pluralize(titleCase(name)));
     }
 
     public List<Attribute> getAttributes() {
@@ -117,11 +117,11 @@ public String getIcon() {
     }
 
     public String getTitle() {
-        return getProperty("title", name);
+        return getProperty("title", titleCase(name));
     }
 
     public String getDescription() {
-        return getProperty("description", name);
+        return getProperty("description", "");
     }
 
     @Override

diff --git a/...ation/generator/ApplicationGenerator.java → ...plication/generator/CRUDAppGenerator.java b/...ation/generator/ApplicationGenerator.java → ...plication/generator/CRUDAppGenerator.java
@@ -43,7 +43,7 @@
 import java.util.Map;
 import java.util.Set;
 
-public class ApplicationGenerator {
+public class CRUDAppGenerator {
 
     private final String _package;
     private final String domainLayer;
@@ -52,7 +52,7 @@ public class ApplicationGenerator {
     private final ERModel model;
     private static final boolean IS_LOCAL = false; // Change this flag for local vs. production
 
-    public ApplicationGenerator(ERModel model, String _package, String domainLayer, String repositoryLayer, String controllerLayer) {
+    public CRUDAppGenerator(ERModel model, String _package, String domainLayer, String repositoryLayer, String controllerLayer) {
         this._package = _package;
         this.model = model;
         if (domainLayer == null || domainLayer.trim().isEmpty()) {
@@ -131,7 +131,7 @@ public static void main(String[] args) {
         String domainLayer = "domain";
         String repositoryLayer = "service";
         String controllerLayer = "resource";
-        ApplicationGenerator generator = new ApplicationGenerator(erModel, _package, domainLayer, repositoryLayer, controllerLayer);
+        CRUDAppGenerator generator = new CRUDAppGenerator(erModel, _package, domainLayer, repositoryLayer, controllerLayer);
         try {
             generator.generate(new File("D:\\HelloWorld"), true, true, true, true); // Output directory
         } catch (IOException e) {

diff --git a/PayaraStarterGenerator/src/main/resources/template/html/entity.html.ftl b/PayaraStarterGenerator/src/main/resources/template/html/entity.html.ftl
@@ -14,8 +14,9 @@
     the License.
 -->
 <div class="container mt-5">
-    <h1 class="mb-4">${entityNameTitleCase} Management</h1>
-    <button class="btn btn-success mb-4" id="new${entityNameTitleCase}Button">Add ${entityNameTitleCase}</button>
+    <h1 class="mb-4">${entity.getTitle()}</h1>
+    <p>${entity.getDescription()}</p>
+    <button class="btn btn-success mb-4" id="new${entityNameTitleCase}Button">Add ${entity.getTitle()}</button>
 
     <!-- ${entityNameTitleCase} Table -->
     <table id="${entityNameLowerCasePluralize}Table" class="table table-bordered">
@@ -37,7 +38,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="${entityNameLowerCase}ModalLabel">Add ${entityNameTitleCase}</h5>
+                <h5 class="modal-title" id="${entityNameLowerCase}ModalLabel">Add ${entity.getTitle()}</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -143,7 +144,7 @@
         $('#new${entityNameTitleCase}Button').on('click', function () {
             $('#${entityNameLowerCase}Form')[0].reset();
             $('#${entity.getPrimaryKeyName()}').prop('disabled', false);
-            $('#${entityNameLowerCase}ModalLabel').text('Add ${entityNameTitleCase}');
+            $('#${entityNameLowerCase}ModalLabel').text('Add ${entity.getTitle()}');
             $('#saveButton').show();
             $('#updateButton').hide();
             $('#${entityNameLowerCase}Modal').modal('show');
@@ -235,7 +236,7 @@
                     $('#${attribute.name}').val(${entityNameLowerCase}.${attribute.name})<#if attribute.isPrimaryKey()>.prop('disabled', true)</#if>;
                         </#if>
                     </#list>
-                    $('#${entityNameLowerCase}ModalLabel').text('Edit ${entityNameTitleCase}');
+                    $('#${entityNameLowerCase}ModalLabel').text('Edit ${entity.getTitle()}');
                     $('#saveButton').hide();
                     $('#updateButton').show();
                     $('#${entityNameLowerCase}Modal').modal('show');

diff --git a/starter-ui/nb-configuration.xml b/starter-ui/nb-configuration.xml
@@ -13,7 +13,7 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>pfv5ee8</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
+        <netbeans.hint.jdkPlatform>JDK_17</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>
diff --git a/starter-ui/pom.xml b/starter-ui/pom.xml
@@ -91,6 +91,26 @@
             <artifactId>payara-starter-generator</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-open-ai</artifactId>
+            <version>0.30.0</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-easy-rag</artifactId>
+            <version>0.30.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.theokanning.openai-gpt3-java</groupId>
+            <artifactId>service</artifactId>
+            <version>0.18.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.config</groupId>
+            <artifactId>microprofile-config-api</artifactId>
+            <version>3.1</version>
+        </dependency>
     </dependencies>
     <build>
         <extensions>
@@ -129,7 +149,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <release>11</release>
+                    <release>17</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -174,7 +194,7 @@
             <plugin>
                 <groupId>fish.payara.maven.plugins</groupId>
                 <artifactId>payara-cloud-maven-plugin</artifactId>
-                <version>1.0-Alpha1</version>
+                <version>1.0-Alpha2</version>
             </plugin>
         </plugins>
     </build>