[DEV] update new archidata

This commit is contained in:
Edouard DUPIN 2024-01-17 20:20:31 +01:00
parent a538da73ce
commit 511c6d0bc7
2 changed files with 22 additions and 21 deletions

View File

@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>kangaroo-and-rabbit</groupId> <groupId>kangaroo-and-rabbit</groupId>
<artifactId>archidata</artifactId> <artifactId>archidata</artifactId>
<version>0.5.0</version> <version>0.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

View File

@ -11,6 +11,7 @@ import org.glassfish.jersey.media.multipart.FormDataParam;
import org.kar.archidata.dataAccess.DataAccess; import org.kar.archidata.dataAccess.DataAccess;
import org.kar.archidata.dataAccess.QueryCondition; import org.kar.archidata.dataAccess.QueryCondition;
import org.kar.archidata.dataAccess.addOn.AddOnManyToMany; import org.kar.archidata.dataAccess.addOn.AddOnManyToMany;
import org.kar.archidata.dataAccess.options.Condition;
import org.kar.archidata.model.Data; import org.kar.archidata.model.Data;
import org.kar.archidata.tools.DataTools; import org.kar.archidata.tools.DataTools;
import org.kar.karusic.model.Album; import org.kar.karusic.model.Album;
@ -172,7 +173,7 @@ public class TrackResource {
System.out.println("Find typeNode"); System.out.println("Find typeNode");
Gender genderElem = null; Gender genderElem = null;
if (gender != null) { if (gender != null) {
genderElem = DataAccess.getWhere(Gender.class, new QueryCondition("name", "=", gender)); genderElem = DataAccess.getWhere(Gender.class, new Condition(new QueryCondition("name", "=", gender)));
if (genderElem == null) { if (genderElem == null) {
genderElem = new Gender(); genderElem = new Gender();
genderElem.name = gender; genderElem.name = gender;
@ -188,7 +189,7 @@ public class TrackResource {
Artist artistElem = null; Artist artistElem = null;
if (artist != null) { if (artist != null) {
artistElem = DataAccess.getWhere(Artist.class, new QueryCondition("name", "=", artist)); artistElem = DataAccess.getWhere(Artist.class, new Condition(new QueryCondition("name", "=", artist)));
if (artistElem == null) { if (artistElem == null) {
artistElem = new Artist(); artistElem = new Artist();
artistElem.name = artist; artistElem.name = artist;
@ -199,7 +200,7 @@ public class TrackResource {
Album albumElem = null; Album albumElem = null;
if (album != null) { if (album != null) {
albumElem = DataAccess.getWhere(Album.class, new QueryCondition("name", "=", album)); albumElem = DataAccess.getWhere(Album.class, new Condition(new QueryCondition("name", "=", album)));
if (albumElem == null) { if (albumElem == null) {
albumElem = new Album(); albumElem = new Album();
albumElem.name = album; albumElem.name = album;