Skip to content

Update dependecies #1

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 2 commits into
base: develop
Choose a base branch
from
Open

Update dependecies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
672afaf
LEAFLET-5 update global pom to 5.2.1 and Lutece core to 7.0.4+
rdeniel Feb 3, 2022
a89318e
LEAFLET-6 fix some Sonar feedbacks
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>3.0.5</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>[5.0.0,)</version>
<version>[7.0.4,)</version>
<type>lutece-core</type>
</dependency>
<dependency>
Expand Down
10 changes: 4 additions & 6 deletions src/java/fr/paris/lutece/plugins/leaflet/business/GeolocItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@

import fr.paris.lutece.util.xml.XmlUtil;

import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;

import java.io.IOException;
Expand Down Expand Up @@ -96,7 +94,7 @@ public class GeolocItem
@JsonProperty( PATH_GEOMETRY )
public void setGeometry( Map<String, Object> geometry )
{
_lonlat = (List<Double>) geometry.get( PATH_GEOMETRY_COORDINATES );
_lonlat = ( List<Double> ) geometry.get( PATH_GEOMETRY_COORDINATES );
}

/**
Expand Down Expand Up @@ -131,7 +129,7 @@ public String getType( )
@JsonProperty( PATH_PROPERTIES )
public Map<String, Object> getProperties( )
{
HashMap<String, Object> properties = new HashMap<String, Object>( );
HashMap<String, Object> properties = new HashMap<>( );

if ( _address != null )
{
Expand Down Expand Up @@ -159,7 +157,7 @@ public Map<String, Object> getProperties( )
@JsonProperty( PATH_GEOMETRY )
public Map<String, Object> getGeometry( )
{
HashMap<String, Object> geometry = new HashMap<String, Object>( );
HashMap<String, Object> geometry = new HashMap<>( );
geometry.put( PATH_GEOMETRY_TYPE, VALUE_GEOMETRY_TYPE );
geometry.put( PATH_GEOMETRY_COORDINATES, _lonlat );

Expand Down Expand Up @@ -292,7 +290,7 @@ public String toXML( )
* @return The geolocItem object
*/
public static GeolocItem fromJSON( String strJson )
throws JsonParseException, JsonMappingException, IOException
throws IOException
{
return _objectMapper.readValue( strJson, GeolocItem.class );
}
Expand Down
6 changes: 2 additions & 4 deletions src/java/fr/paris/lutece/plugins/leaflet/service/IconService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private IconService( )
public static Collection<String> getList( )
{
ReferenceList referenceList = DatastoreService.getDataByPrefix( DATASTORE_ICONS_PREFIX );
HashSet<String> hashSet = new HashSet<String>( );
HashSet<String> hashSet = new HashSet<>( );

for ( ReferenceItem referenceItem : referenceList )
{
Expand All @@ -78,9 +78,7 @@ public static Collection<String> getList( )
hashSet.add( code );
}

ArrayList<String> result = new ArrayList<String>( hashSet );

return result;
return new ArrayList<>( hashSet );
}

/**
Expand Down