Added loadById Optional

to FacadeDefGenerator and FacadeImplDataGenerator #17

Author: fugerit79

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed javax.ejb.Stateles annotation from default rest generator
 - Fixed typo on FactoryDefGenerator
 - Stream loadAll method added to FacadeDefGenerator and FacadeImplDataGenerator (#17)
+- Added loadById Optional to FacadeDefGenerator and FacadeImplDataGenerator (#17)
 - Sample stub for finder, facade and rest load classes regenerated.
 
 ### Removed

fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/gen/DaogenBasicGenerator.java

@@ -33,6 +33,8 @@ public abstract class DaogenBasicGenerator extends SimpleJavaGenerator implement
 
 	protected static final String JD_THROWS = " * @throws ";
 
+	protected static final String CLOSE_AND_THROWS = " ) throws ";
+	
 	protected static final String AT_OVERRIDE = "@Override";
 
 	protected static final String REAL_CLASS_COMMENT = TAB+"// [HELPER/IMPL MODEL] this class is a stub and can be modified as you see fit (it will not been overwritten)";

fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/gen/FacadeDefGenerator.java

@@ -1,6 +1,7 @@
 package org.fugerit.java.daogen.base.gen;
 
 import java.io.IOException;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.fugerit.java.core.cfg.ConfigException;
@@ -56,6 +57,9 @@ public void init( DaogenCatalogConfig daogenConfig, DaogenCatalogEntity entity )
 			this.setClassBaseResult( DaogenClassConfigHelper.addImport( daogenConfig , DaogenClassConfigHelper.DAO_RESULT_BASE, this.getImportList() ) );
 			this.getImportList().add( this.getDaogenConfig().getGeneralProp( DaogenCatalogConstants.GEN_PROP_PACKAGE_MODEL )+"."+this.getEntityModelName() );
 			this.getImportList().add( Stream.class.getName() );
+			if ( StringUtils.isNotEmpty( this.getCurrentEntity().getPrimaryKey() ) ) {
+				this.getImportList().add( Optional.class.getName() );
+			}
 		}
 	}
 
@@ -120,7 +124,10 @@ public void generateDaogenBody() throws IOException {
 			this.getWriter().println();
 			if ( StringUtils.isNotEmpty( this.getCurrentEntity().getPrimaryKey() ) ) {
 				GeneratorKeyHelper primaryKeyHelper = new GeneratorKeyHelper( this.getDaogenConfig() , this.getCurrentEntity(), this.getCurrentEntity().getPrimaryKey() );
+				// load by id
 				methodByKey( primaryKeyHelper.setForLoadInterface(), METHOD_LOAD_BY_PK, this.getEntityModelName(), "The found object or <code>null</code>", "Load method by "+PRIMARY_KEY+FOR_ENTITY_LIT+this.getEntityModelName() );
+				// load by id optional
+				methodByKey( primaryKeyHelper.setForLoadInterface(), METHOD_LOAD_BY_PK+Optional.class.getSimpleName(), Optional.class.getSimpleName()+"<"+this.getEntityModelName()+">", "The found object or <code>null</code>", "Load method by "+PRIMARY_KEY+FOR_ENTITY_LIT+this.getEntityModelName() );
 				if ( FacadeGeneratorUtils.isFacadeModeInsert( this.getCurrentEntity() ) ) {
 					DaogenCustomCode.addCommentFacadeDef( "facade.def.create" , DaogenCustomCode.INDENT_1, this.getWriter(), this.getEntityModelName() );	
 					this.getWriter().println( TAB+""+this.getClassBaseResult()+"<"+this.getEntityModelName()+"> create( "+this.getClassDaogenContext()+CONTEXT_LIT+this.getEntityModelName()+" model ) throws "+this.getClassDaoException()+";" );

fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/gen/FacadeImplDataGenerator.java

@@ -1,6 +1,7 @@
 package org.fugerit.java.daogen.base.gen;
 
 import java.io.IOException;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.fugerit.java.core.cfg.ConfigException;
@@ -58,6 +59,9 @@ private void initConfigHelperMode( DaogenCatalogConfig daogenConfig) {
 			this.setImplementsInterface( DaogenHelperGenerator.toHelperClassName( this.getEntityFacadeDefName() ) );
 		}
 		this.getImportList().add( Stream.class.getName() );
+		if ( StringUtils.isNotEmpty( this.getCurrentEntity().getPrimaryKey() ) ) {
+			this.getImportList().add( Optional.class.getName() );
+		}
 		this.setExtendsClass( this.getClassDataFacade()+LT_LIT+this.getEntityModelName()+">" );
 	}
 
@@ -241,7 +245,7 @@ private void generateHelperClassInsert( DaogenCatalogField colData, DaogenCatalo
 	private void generateHelperClassLoadPk( GeneratorKeyHelper primaryKeyHelper ) {
 		// load by primary key
 		this.getWriter().println( TAB+AT_OVERRIDE );
-		this.getWriter().println( TAB+PUBLIC_LIT+this.getEntityModelName()+" "+FacadeDefGenerator.METHOD_LOAD_BY_PK+"( "+this.getClassDaogenContext()+CONTEXT_LIT+primaryKeyHelper.setForLoadInterface().getKeyParams()+" ) throws "+this.getClassDaoException()+" {" );
+		this.getWriter().println( TAB+PUBLIC_LIT+this.getEntityModelName()+" "+FacadeDefGenerator.METHOD_LOAD_BY_PK+"( "+this.getClassDaogenContext()+CONTEXT_LIT+primaryKeyHelper.setForLoadInterface().getKeyParams()+CLOSE_AND_THROWS+this.getClassDaoException()+" {" );
 		this.getWriter().println( TAB_2+this.getEntityModelName()+" result = null;" );
 		this.getWriter().println( TAB_2+this.getClassDaoHelper()+LT_LIT+this.getEntityModelName()+GT_LIT+DAO_HELPER_LIT+this.getClassDaoHelper()+CONTEXT_GEN_LIT );
 		this.getWriter().println( TAB_2+"SelectHelper query = daoHelper.newSelectHelper( this.getQueryView(), this.getTableName() );" );
@@ -268,13 +272,18 @@ private void generateHelperClassLoadPk( GeneratorKeyHelper primaryKeyHelper ) {
 		this.getWriter().println( TAB_2+RETURN_RESULT_LIT );
 		this.getWriter().println( TAB+"}" );
 		this.getWriter().println();
+		// load by primary key optional
+		this.getWriter().println( TAB+AT_OVERRIDE );
+		this.getWriter().println( TAB+PUBLIC_LIT+Optional.class.getSimpleName()+"<"+this.getEntityModelName()+"> "+FacadeDefGenerator.METHOD_LOAD_BY_PK+"Optional( "+this.getClassDaogenContext()+CONTEXT_LIT+primaryKeyHelper.setForLoadInterface().getKeyParams()+CLOSE_AND_THROWS+this.getClassDaoException()+" {" );
+		this.getWriter().println( TAB_2+"return "+Optional.class.getSimpleName()+".ofNullable( "+FacadeDefGenerator.METHOD_LOAD_BY_PK+"("+CONTEXT_LIT+primaryKeyHelper.getFieldNames()+") );" );
+		this.getWriter().println( TAB+"}" );
+		this.getWriter().println();
 	}
 
 	private void generateHelperClassDelete(GeneratorKeyHelper primaryKeyHelper) {
 		if ( FacadeGeneratorUtils.isFacadeModeDelete( this.getCurrentEntity() ) ) {
 			// delete by primary key
-			this.getWriter().println( TAB+AT_OVERRIDE );
-			this.getWriter().println( TAB+PUBLIC_LIT+this.getEntityBaseResult()+" "+FacadeDefGenerator.METHOD_DELETE_BY_PK+"( "+this.getClassDaogenContext()+CONTEXT_LIT+primaryKeyHelper.setForLoadInterface().getKeyParams()+" ) throws "+this.getClassDaoException()+" {" );
+			this.getWriter().println( TAB+AT_OVERRIDE );			this.getWriter().println( TAB+PUBLIC_LIT+this.getEntityBaseResult()+" "+FacadeDefGenerator.METHOD_DELETE_BY_PK+"( "+this.getClassDaogenContext()+CONTEXT_LIT+primaryKeyHelper.setForLoadInterface().getKeyParams()+CLOSE_AND_THROWS+this.getClassDaoException()+" {" );
 			this.getWriter().println( TAB_2+this.getEntityBaseResult()+" result = new "+this.getClassBaseResult()+GENERIC_LIT );
 			this.getWriter().println( TAB_2+this.getClassDaoHelper()+LT_LIT+this.getEntityModelName()+GT_LIT+DAO_HELPER_LIT+this.getClassDaoHelper()+CONTEXT_GEN_LIT );
 			this.getWriter().println( TAB_2+"DeleteHelper query = daoHelper.newDeleteHelper( this.getTableName() );" );

fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/gen/GeneratorKeyHelper.java

@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 import org.fugerit.java.core.javagen.GeneratorNameHelper;
 import org.fugerit.java.core.lang.helpers.StringUtils;
@@ -42,6 +43,10 @@ public class GeneratorKeyHelper implements Serializable {
 
 	private Set<String> keyFields;
 
+	public String getFieldNames() {
+		return StringUtils.concat( "," , this.keyFields.stream().map( GeneratorNameHelper::toPropertyName ).collect( Collectors.toList() ) );
+	}
+	
 	public GeneratorKeyHelper( DaogenCatalogConfig config, DaogenCatalogEntity entity, String key ) {
 		this.config = config;
 		this.entity = entity;