Skip to content

POM and DAO updates #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

POM and DAO updates #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
639b2aa
HTMLPAGE-30 update global pom and Lutece core version
rdeniel Feb 3, 2022
1a47749
HTMLPAGE-31 update DAOUtils calls
rdeniel Feb 3, 2022
e988aa2
HTMLPAGE-32 improve Sonar review
rdeniel Feb 3, 2022
1cf7190
HTMLPAGE-33 new unit test
rdeniel Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>lutece-global-pom</artifactId>
<groupId>fr.paris.lutece.tools</groupId>
<version>5.2.0</version>
<version>5.2.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>fr.paris.lutece</groupId>
<artifactId>lutece-core</artifactId>
<version>[7.0.0,)</version>
<version>[7.0.2,)</version>
<type>lutece-core</type>
</dependency>
</dependencies>
Expand Down
185 changes: 93 additions & 92 deletions src/java/fr/paris/lutece/plugins/htmlpage/business/HtmlPageDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ public class HtmlPageDAO implements IHtmlPageDAO
*/
private int newPrimaryKey( Plugin plugin )
{
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_NEWPK, plugin );
daoUtil.executeQuery( );

int nKey;
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_NEWPK, plugin ) )
{
daoUtil.executeQuery( );

if ( !daoUtil.next( ) )
{
Expand All @@ -80,8 +80,7 @@ private int newPrimaryKey( Plugin plugin )
}

nKey = daoUtil.getInt( 1 ) + 1;

daoUtil.free( );
}

return nKey;
}
Expand All @@ -99,17 +98,18 @@ private int newPrimaryKey( Plugin plugin )
*/
public void insert( HtmlPage htmlpage, Plugin plugin )
{
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_INSERT, plugin );
htmlpage.setId( newPrimaryKey( plugin ) );
daoUtil.setInt( 1, htmlpage.getId( ) );
daoUtil.setString( 2, htmlpage.getDescription( ) );
daoUtil.setString( 3, htmlpage.getHtmlContent( ) );
daoUtil.setInt( 4, htmlpage.getStatus( ) );
daoUtil.setString( 5, htmlpage.getWorkgroup( ) );
daoUtil.setString( 6, htmlpage.getRole( ) );

daoUtil.executeUpdate( );
daoUtil.free( );
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_INSERT, plugin ) )
{
htmlpage.setId( newPrimaryKey( plugin ) );
daoUtil.setInt( 1, htmlpage.getId( ) );
daoUtil.setString( 2, htmlpage.getDescription( ) );
daoUtil.setString( 3, htmlpage.getHtmlContent( ) );
daoUtil.setInt( 4, htmlpage.getStatus( ) );
daoUtil.setString( 5, htmlpage.getWorkgroup( ) );
daoUtil.setString( 6, htmlpage.getRole( ) );

daoUtil.executeUpdate( );
}
}

/**
Expand All @@ -123,24 +123,24 @@ public void insert( HtmlPage htmlpage, Plugin plugin )
*/
public HtmlPage load( int nHtmlPageId, Plugin plugin )
{
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT, plugin );
daoUtil.setInt( 1, nHtmlPageId );
daoUtil.executeQuery( );

HtmlPage htmlpage = null;

if ( daoUtil.next( ) )
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT, plugin ) )
{
htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
}
daoUtil.setInt( 1, nHtmlPageId );
daoUtil.executeQuery( );

if ( daoUtil.next( ) )
{
htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
}

daoUtil.free( );
}

return htmlpage;
}
Expand All @@ -155,10 +155,11 @@ public HtmlPage load( int nHtmlPageId, Plugin plugin )
*/
public void delete( HtmlPage htmlpage, Plugin plugin )
{
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_DELETE, plugin );
daoUtil.setInt( 1, htmlpage.getId( ) );
daoUtil.executeUpdate( );
daoUtil.free( );
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_DELETE, plugin ) )
{
daoUtil.setInt( 1, htmlpage.getId( ) );
daoUtil.executeUpdate( );
}
}

/**
Expand All @@ -171,18 +172,19 @@ public void delete( HtmlPage htmlpage, Plugin plugin )
*/
public void store( HtmlPage htmlpage, Plugin plugin )
{
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_UPDATE, plugin );
int nHtmlPageId = htmlpage.getId( );

daoUtil.setString( 1, htmlpage.getDescription( ) );
daoUtil.setString( 2, htmlpage.getHtmlContent( ) );
daoUtil.setInt( 3, htmlpage.getStatus( ) );
daoUtil.setString( 4, htmlpage.getWorkgroup( ) );
daoUtil.setString( 5, htmlpage.getRole( ) );
daoUtil.setInt( 6, nHtmlPageId );

daoUtil.executeUpdate( );
daoUtil.free( );
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_UPDATE, plugin ) )
{
int nHtmlPageId = htmlpage.getId( );

daoUtil.setString( 1, htmlpage.getDescription( ) );
daoUtil.setString( 2, htmlpage.getHtmlContent( ) );
daoUtil.setInt( 3, htmlpage.getStatus( ) );
daoUtil.setString( 4, htmlpage.getWorkgroup( ) );
daoUtil.setString( 5, htmlpage.getRole( ) );
daoUtil.setInt( 6, nHtmlPageId );

daoUtil.executeUpdate( );
}
}

/**
Expand All @@ -194,24 +196,24 @@ public void store( HtmlPage htmlpage, Plugin plugin )
*/
public Collection<HtmlPage> selectAll( Plugin plugin )
{
Collection<HtmlPage> htmlpageList = new ArrayList<HtmlPage>( );
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECTALL, plugin );
daoUtil.executeQuery( );

while ( daoUtil.next( ) )
Collection<HtmlPage> htmlpageList = new ArrayList<>( );
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECTALL, plugin ) )
{
HtmlPage htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
htmlpageList.add( htmlpage );
daoUtil.executeQuery( );

while ( daoUtil.next( ) )
{
HtmlPage htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
htmlpageList.add( htmlpage );
}
}

daoUtil.free( );

return htmlpageList;
}

Expand All @@ -226,25 +228,24 @@ public Collection<HtmlPage> selectAll( Plugin plugin )
*/
public HtmlPage selectEnabledHtmlPage( int nHtmlPageId, Plugin plugin )
{
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_ENABLED, plugin );
daoUtil.setInt( 1, nHtmlPageId );
daoUtil.executeQuery( );

HtmlPage htmlpage = null;

if ( daoUtil.next( ) )
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_ENABLED, plugin ) )
{
htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
daoUtil.setInt( 1, nHtmlPageId );
daoUtil.executeQuery( );

if ( daoUtil.next( ) )
{
htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
}
}

daoUtil.free( );

return htmlpage;
}

Expand All @@ -257,24 +258,24 @@ public HtmlPage selectEnabledHtmlPage( int nHtmlPageId, Plugin plugin )
*/
public Collection<HtmlPage> selectEnabledHtmlPageList( Plugin plugin )
{
Collection<HtmlPage> htmlpageList = new ArrayList<HtmlPage>( );
DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_ENABLED_HTMLPAGE_LIST, plugin );
daoUtil.executeQuery( );

while ( daoUtil.next( ) )
Collection<HtmlPage> htmlpageList = new ArrayList<>( );
try( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_ENABLED_HTMLPAGE_LIST, plugin ) )
{
HtmlPage htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
htmlpageList.add( htmlpage );
daoUtil.executeQuery( );

while ( daoUtil.next( ) )
{
HtmlPage htmlpage = new HtmlPage( );
htmlpage.setId( daoUtil.getInt( 1 ) );
htmlpage.setDescription( daoUtil.getString( 2 ) );
htmlpage.setHtmlContent( daoUtil.getString( 3 ) );
htmlpage.setStatus( daoUtil.getInt( 4 ) );
htmlpage.setWorkgroup( daoUtil.getString( 5 ) );
htmlpage.setRole( daoUtil.getString( 6 ) );
htmlpageList.add( htmlpage );
}
}

daoUtil.free( );

return htmlpageList;
}
}
2 changes: 1 addition & 1 deletion src/java/fr/paris/lutece/plugins/htmlpage/business/HtmlPageHome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
public class HtmlPageHome
{
// Static variable pointed at the DAO instance
private static IHtmlPageDAO _dao = (IHtmlPageDAO) SpringContextService.getPluginBean( "htmlpage", "htmlPageDAO" );
private static IHtmlPageDAO _dao = SpringContextService.getBean( "htmlPageDAO" );

/**
* Private constructor - this class need not be instantiated
Expand Down
1 change: 1 addition & 0 deletions src/java/fr/paris/lutece/plugins/htmlpage/service/HtmlPagePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class HtmlPagePlugin extends PluginDefaultImplementation
/**
* Initialize the plugin HtmlPage
*/
@Override
public void init( )
{
HtmlPageService.getInstance( ).init( );
Expand Down
12 changes: 4 additions & 8 deletions src/java/fr/paris/lutece/plugins/htmlpage/service/search/HtmlPageIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void indexDocuments( ) throws IOException, InterruptedException, SiteMess
*/
public List<Document> getDocuments( String strId ) throws IOException, InterruptedException, SiteMessageException
{
ArrayList<org.apache.lucene.document.Document> listDocuments = new ArrayList<Document>( );
ArrayList<org.apache.lucene.document.Document> listDocuments = new ArrayList<>( );
String strPortalUrl = AppPathService.getPortalUrl( );
Plugin plugin = PluginService.getPlugin( HtmlPagePlugin.PLUGIN_NAME );

Expand Down Expand Up @@ -209,7 +209,7 @@ public boolean isEnable( )
* @throws SiteMessageException
* occurs when a site message need to be displayed
*/
private Document getDocument( HtmlPage htmlpage, String strUrl, Plugin plugin ) throws IOException, InterruptedException, SiteMessageException
private Document getDocument( HtmlPage htmlpage, String strUrl, Plugin plugin ) throws IOException
{
// make a new, empty document
org.apache.lucene.document.Document doc = new org.apache.lucene.document.Document( );
Expand All @@ -231,11 +231,7 @@ private Document getDocument( HtmlPage htmlpage, String strUrl, Plugin plugin )
{
new HtmlParser( ).parse( new ByteArrayInputStream( strContentToIndex.getBytes( ) ), handler, metadata, new ParseContext( ) );
}
catch( SAXException e )
{
throw new AppException( "Error during page parsing." );
}
catch( TikaException e )
catch( SAXException | TikaException e )
{
throw new AppException( "Error during page parsing." );
}
Expand Down Expand Up @@ -282,7 +278,7 @@ private static String getContentToIndex( HtmlPage htmlpage )
*/
public List<String> getListType( )
{
List<String> listType = new ArrayList<String>( );
List<String> listType = new ArrayList<>( );
listType.add( HtmlPagePlugin.PLUGIN_NAME );

return listType;
Expand Down
4 changes: 2 additions & 2 deletions src/java/fr/paris/lutece/plugins/htmlpage/service/search/HtmlPageSearchEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class HtmlPageSearchEngine implements SearchEngine
*/
public List<SearchResult> getSearchResults( String strQuery, HttpServletRequest request )
{
ArrayList<SearchItem> listResults = new ArrayList<SearchItem>( );
ArrayList<SearchItem> listResults = new ArrayList<>( );
IndexSearcher searcher = null;

try ( Directory directory = IndexationService.getDirectoryIndex( ) ; IndexReader ir = DirectoryReader.open( directory ) ; )
Expand Down Expand Up @@ -128,7 +128,7 @@ public List<SearchResult> getSearchResults( String strQuery, HttpServletRequest
*/
private List<SearchResult> convertList( List<SearchItem> listSource )
{
List<SearchResult> listDest = new ArrayList<SearchResult>( );
List<SearchResult> listDest = new ArrayList<>( );

for ( SearchItem item : listSource )
{
Expand Down
10 changes: 5 additions & 5 deletions src/java/fr/paris/lutece/plugins/htmlpage/web/HtmlPageApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,20 +155,20 @@ private String getSearch( String strQuery, String strPluginName, HttpServletRequ
SearchEngine engine = SpringContextService.getBean( BEAN_SEARCH_ENGINE );
List<SearchResult> listResults = engine.getSearchResults( strQuery, request );

HashMap<String, Object> model = new HashMap<String, Object>( );
HashMap<String, Object> model = new HashMap<>( );
model.put( MARK_RESULT, listResults );
model.put( MARK_QUERY, strQuery );

HtmlTemplate template = AppTemplateService.getTemplate( TEMPLATE_XPAGE_HTMLPAGE_LISTS, request.getLocale( ), model );
return template.getHtml( );
}

private String getHtmlPagesLists( HttpServletRequest request ) throws SiteMessageException
private String getHtmlPagesLists( HttpServletRequest request )
{
HashMap<String, Object> model = new HashMap<String, Object>( );
HashMap<String, Object> model = new HashMap<>( );

Collection<HtmlPage> htmlPageList = HtmlPageHome.findEnabledHtmlPageList( _plugin );
Collection<HtmlPage> visibleHtmlPageList = new ArrayList<HtmlPage>( ); // filter the list of lists by role
Collection<HtmlPage> visibleHtmlPageList = new ArrayList<>( ); // filter the list of lists by role

for ( HtmlPage htmlpage : htmlPageList )
{
Expand Down Expand Up @@ -196,7 +196,7 @@ private String getHtmlPagesLists( HttpServletRequest request ) throws SiteMessag
*/
private String getHtmlPage( HttpServletRequest request, String strHtmlPageId ) throws SiteMessageException
{
HashMap<String, Object> model = new HashMap<String, Object>( );
HashMap<String, Object> model = new HashMap<>( );

int nHtmlPageId = Integer.parseInt( strHtmlPageId );
HtmlPage htmlpage = HtmlPageHome.findByPrimaryKey( nHtmlPageId, _plugin );
Expand Down
Loading