Commit 7302b2b7 authored by LAVENIER's avatar LAVENIER
Browse files

Merge branch 'release/1.5.6'

parents cbe638c7 4bab8a61
......@@ -3,7 +3,7 @@
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.5</version>
<version>1.5.6</version>
<packaging>pom</packaging>
<name>SUMARiS</name>
<description>SUMARiS :: Maven parent</description>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.5</version>
<version>1.5.6</version>
</parent>
<artifactId>sumaris-core-extraction</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.5.5</version>
<version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.5.5</version>
<version>1.5.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.5</version>
<version>1.5.6</version>
</parent>
<artifactId>sumaris-core-shared</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.5</version>
<version>1.5.6</version>
</parent>
<artifactId>sumaris-core</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.5</version>
<version>1.5.6</version>
</parent>
<artifactId>sumaris-server</artifactId>
......
......@@ -308,32 +308,21 @@ public class DataGraphQLService {
return result;
}
/**
* @deprecated
*/
@GraphQLMutation(name = "saveTrip", description = "Create or update a trip",
deprecationReason = "Please use saveTrip(TripVO, TripSaveOptions)")
@IsUser
@Deprecated
public TripVO saveTrip(@GraphQLArgument(name = "trip") TripVO trip,
@GraphQLArgument(name = "withOperation", defaultValue = "false") Boolean withOperation,
@GraphQLEnvironment() Set<String> fields) {
// Warn in log
logDeprecatedUse("saveTrip(TripVO, withOperation)", "1.5.0");
return saveTrip(trip, TripSaveOptions.builder()
.withOperation(withOperation)
.build(),
fields);
}
@GraphQLMutation(name = "saveTrip", description = "Create or update a trip")
@IsUser
public TripVO saveTrip(@GraphQLArgument(name = "trip") TripVO trip,
@GraphQLArgument(name = "withOperation", defaultValue = "false") Boolean withOperation,
@GraphQLArgument(name = "saveOptions") TripSaveOptions saveOptions,
@GraphQLEnvironment() Set<String> fields) {
// For compat prior to 1.5
if (saveOptions == null && withOperation != null) {
logDeprecatedUse("saveTrip(TripVO, withOperation)", "1.5.0");
saveOptions = TripSaveOptions.builder()
.withOperation(withOperation)
.build();
}
final TripVO result = tripService.save(trip, saveOptions);
// Add additional properties if needed
......@@ -342,31 +331,21 @@ public class DataGraphQLService {
return result;
}
/**
* @deprecated
*/
@GraphQLMutation(name = "saveTrips", description = "Create or update many trips",
deprecationReason = "Please use saveTrips(TripVO, TripSaveOptions)")
@GraphQLMutation(name = "saveTrips", description = "Create or update many trips")
@IsUser
@Deprecated
public List<TripVO> saveTrips(@GraphQLArgument(name = "trips") List<TripVO> trips,
@GraphQLArgument(name = "withOperation", defaultValue = "false") Boolean withOperation,
@GraphQLArgument(name = "saveOptions") TripSaveOptions saveOptions,
@GraphQLEnvironment() Set<String> fields) {
// Warn in log
logDeprecatedUse("saveTrips(TripVO, withOperation)", "1.5.0");
return saveTrips(trips, TripSaveOptions.builder()
.withOperation(withOperation)
.build(),
fields);
}
// For compat prior to 1.5
if (saveOptions == null && withOperation != null) {
logDeprecatedUse("saveTrip(TripVO, withOperation)", "1.5.0");
saveOptions = TripSaveOptions.builder()
.withOperation(withOperation)
.build();
}
@GraphQLMutation(name = "saveTrips", description = "Create or update many trips")
@IsUser
public List<TripVO> saveTrips(@GraphQLArgument(name = "trips") List<TripVO> trips,
@GraphQLArgument(name = "saveOptions") TripSaveOptions saveOptions,
@GraphQLEnvironment() Set<String> fields) {
final List<TripVO> result = tripService.save(trips, saveOptions);
// Add additional properties if needed
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.5</version>
<version>1.5.6</version>
</parent>
<artifactId>sumaris-test-shared</artifactId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment