[all] migration vertigo 1.1.3

vertigo-demo-orchestra/pom.xml

@@ -15,7 +15,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sonar.sources>src/main/java</sonar.sources>
-		<vertigo.version>1.1.2</vertigo.version>
+		<vertigo.version>1.1.3</vertigo.version>
   	</properties>
 
 

vertigo-demo-vega/pom.xml

@@ -15,7 +15,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<maven.test.error.ignore>true</maven.test.error.ignore>
-		<vertigo.version>1.1.2</vertigo.version>
+		<vertigo.version>1.1.3</vertigo.version>
 	</properties>
 
 	<dependencies>

vertigo-demo-vega/src/main/java/io/vertigo/pandora/services/common/CommonServicesImpl.java

@@ -30,6 +30,8 @@
 import io.vertigo.lang.WrappedException;
 import io.vertigo.pandora.dao.movies.MovieDAO;
 import io.vertigo.pandora.dao.movies.MoviesPAO;
+import io.vertigo.pandora.dao.persons.ActorRoleDAO;
+import io.vertigo.pandora.dao.persons.PersonDAO;
 import io.vertigo.pandora.dao.persons.PersonsPAO;
 import io.vertigo.pandora.domain.movies.Movie;
 import io.vertigo.pandora.domain.movies.MovieIndex;
@@ -56,7 +58,11 @@ public class CommonServicesImpl implements CommonServices {
 	@Inject
 	private PersonsPAO personsPAO;
 	@Inject
+	private ActorRoleDAO actorRoleDAO;
+	@Inject
 	private MovieDAO movieDAO;
+	@Inject
+	private PersonDAO personDAO;
 
 	/** {@inheritDoc} */
 	@Override
@@ -96,7 +102,7 @@ private long reloadPersons() {
 
 		persons.addAll(personMaps.values());
 		personsPAO.removeAllPersons();
-		personsPAO.importPersons(persons);
+		personDAO.importPersons(persons);
 
 		System.out.println("RELOAD ALL persons " + persons.size());
 		return persons.size();
@@ -130,12 +136,12 @@ private long reloadMovies() {
 
 		movies.addAll(movieMaps.values());
 		moviesPAO.removeAllMovies();
-		moviesPAO.importMovies(movies);
+		movieDAO.importMovies(movies);
 		System.out.println("RELOAD DB " + movies.size() + " movies");
 
 		final DtList<ActorRole> actorRoles = readActorRoles();
 		moviesPAO.removeAllActorRoles();
-		moviesPAO.importActorRoles(actorRoles);
+		actorRoleDAO.importActorRoles(actorRoles);
 		System.out.println("RELOAD DB " + actorRoles.size() + " actors");
 
 		reloadMoviesPersonsNN(movieMaps);

vertigo-demo-vega/src/main/javagen/io/vertigo/pandora/dao/movies/MovieDAO.java

@@ -18,6 +18,9 @@
 import io.vertigo.dynamo.collections.model.SelectedFacetValues;
 import io.vertigo.commons.transaction.VTransactionManager;
 import io.vertigo.pandora.domain.movies.MovieIndex;
+import io.vertigo.dynamo.task.metamodel.TaskDefinition;
+import io.vertigo.dynamo.task.model.Task;
+import io.vertigo.dynamo.task.model.TaskBuilder;
 import io.vertigo.dynamo.domain.model.URI;
 import io.vertigo.dynamo.impl.store.util.DAO;
 import io.vertigo.dynamo.store.StoreManager;
@@ -30,7 +33,7 @@
  * This class is automatically generated.
  * DO NOT EDIT THIS FILE DIRECTLY.
  */
- @Generated
+@Generated
 public final class MovieDAO extends DAO<Movie, java.lang.Long> implements StoreServices {
 	private final SearchManager searchManager;
 	private final VTransactionManager transactionManager;
@@ -103,7 +106,7 @@ public SearchQueryBuilder createSearchQueryBuilderMovieWithPoster(final String c
 	 * @return Résultat correspondant à la requête (de type MovieIndex) 
 	 */
 	public FacetedQueryResult<MovieIndex, SearchQuery> loadList(final SearchQuery searchQuery, final DtListState listState) {
-		final SearchIndexDefinition indexDefinition = searchManager.findIndexDefinitionByKeyConcept(Movie.class);
+		final SearchIndexDefinition indexDefinition = searchManager.findFirstIndexDefinitionByKeyConcept(Movie.class);
 		return searchManager.loadList(indexDefinition, searchQuery, listState);
 	}
 
@@ -130,4 +133,26 @@ public void markAsDirty(final URI<Movie> entityUri) {
 	public void markAsDirty(final Movie entity) {
 		markAsDirty(DtObjectUtil.createURI(entity));
 	}
+
+	/**
+	 * Creates a taskBuilder.
+	 * @param name  the name of the task
+	 * @return the builder 
+	 */
+	private static TaskBuilder createTaskBuilder(final String name) {
+		final TaskDefinition taskDefinition = Home.getApp().getDefinitionSpace().resolve(name, TaskDefinition.class);
+		return Task.builder(taskDefinition);
+	}
+
+	/**
+	 * Execute la tache TK_IMPORT_MOVIES.
+	 * @param dtc io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.movies.Movie> 
+	*/
+	public void importMovies(final io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.movies.Movie> dtc) {
+		final Task task = createTaskBuilder("TK_IMPORT_MOVIES")
+				.addValue("DTC", dtc)
+				.build();
+		getTaskManager().execute(task);
+	}
+
 }

vertigo-demo-vega/src/main/javagen/io/vertigo/pandora/dao/movies/MoviesPAO.java

@@ -40,28 +40,6 @@ private static TaskBuilder createTaskBuilder(final String name) {
 		return Task.builder(taskDefinition);
 	}
 
-	/**
-	 * Execute la tache TK_IMPORT_ACTOR_ROLES.
-	 * @param dtc io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.ActorRole> 
-	*/
-	public void importActorRoles(final io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.ActorRole> dtc) {
-		final Task task = createTaskBuilder("TK_IMPORT_ACTOR_ROLES")
-				.addValue("DTC", dtc)
-				.build();
-		getTaskManager().execute(task);
-	}
-
-	/**
-	 * Execute la tache TK_IMPORT_MOVIES.
-	 * @param dtc io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.movies.Movie> 
-	*/
-	public void importMovies(final io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.movies.Movie> dtc) {
-		final Task task = createTaskBuilder("TK_IMPORT_MOVIES")
-				.addValue("DTC", dtc)
-				.build();
-		getTaskManager().execute(task);
-	}
-
 	/**
 	 * Execute la tache TK_LOAD_MOVIE_INDEX.
 	 * @param dtc io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.movies.Dummy> 

vertigo-demo-vega/src/main/javagen/io/vertigo/pandora/dao/persons/ActorRoleDAO.java

@@ -2,6 +2,10 @@
 
 import javax.inject.Inject;
 
+import io.vertigo.app.Home;
+import io.vertigo.dynamo.task.metamodel.TaskDefinition;
+import io.vertigo.dynamo.task.model.Task;
+import io.vertigo.dynamo.task.model.TaskBuilder;
 import io.vertigo.dynamo.impl.store.util.DAO;
 import io.vertigo.dynamo.store.StoreManager;
 import io.vertigo.dynamo.store.StoreServices;
@@ -13,7 +17,7 @@
  * This class is automatically generated.
  * DO NOT EDIT THIS FILE DIRECTLY.
  */
- @Generated
+@Generated
 public final class ActorRoleDAO extends DAO<ActorRole, java.lang.Long> implements StoreServices {
 
 	/**
@@ -26,4 +30,26 @@ public ActorRoleDAO(final StoreManager storeManager, final TaskManager taskManag
 		super(ActorRole.class, storeManager, taskManager);
 	}
 
+
+	/**
+	 * Creates a taskBuilder.
+	 * @param name  the name of the task
+	 * @return the builder 
+	 */
+	private static TaskBuilder createTaskBuilder(final String name) {
+		final TaskDefinition taskDefinition = Home.getApp().getDefinitionSpace().resolve(name, TaskDefinition.class);
+		return Task.builder(taskDefinition);
+	}
+
+	/**
+	 * Execute la tache TK_IMPORT_ACTOR_ROLES.
+	 * @param dtc io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.ActorRole> 
+	*/
+	public void importActorRoles(final io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.ActorRole> dtc) {
+		final Task task = createTaskBuilder("TK_IMPORT_ACTOR_ROLES")
+				.addValue("DTC", dtc)
+				.build();
+		getTaskManager().execute(task);
+	}
+
 }

vertigo-demo-vega/src/main/javagen/io/vertigo/pandora/dao/persons/PersonDAO.java

@@ -18,6 +18,9 @@
 import io.vertigo.dynamo.collections.model.SelectedFacetValues;
 import io.vertigo.commons.transaction.VTransactionManager;
 import io.vertigo.pandora.domain.persons.PersonIndex;
+import io.vertigo.dynamo.task.metamodel.TaskDefinition;
+import io.vertigo.dynamo.task.model.Task;
+import io.vertigo.dynamo.task.model.TaskBuilder;
 import io.vertigo.dynamo.domain.model.URI;
 import io.vertigo.dynamo.impl.store.util.DAO;
 import io.vertigo.dynamo.store.StoreManager;
@@ -30,7 +33,7 @@
  * This class is automatically generated.
  * DO NOT EDIT THIS FILE DIRECTLY.
  */
- @Generated
+@Generated
 public final class PersonDAO extends DAO<Person, java.lang.Long> implements StoreServices {
 	private final SearchManager searchManager;
 	private final VTransactionManager transactionManager;
@@ -91,7 +94,7 @@ public SearchQueryBuilder createSearchQueryBuilderPerson(final String criteria,
 	 * @return Résultat correspondant à la requête (de type PersonIndex) 
 	 */
 	public FacetedQueryResult<PersonIndex, SearchQuery> loadList(final SearchQuery searchQuery, final DtListState listState) {
-		final SearchIndexDefinition indexDefinition = searchManager.findIndexDefinitionByKeyConcept(Person.class);
+		final SearchIndexDefinition indexDefinition = searchManager.findFirstIndexDefinitionByKeyConcept(Person.class);
 		return searchManager.loadList(indexDefinition, searchQuery, listState);
 	}
 
@@ -118,4 +121,26 @@ public void markAsDirty(final URI<Person> entityUri) {
 	public void markAsDirty(final Person entity) {
 		markAsDirty(DtObjectUtil.createURI(entity));
 	}
+
+	/**
+	 * Creates a taskBuilder.
+	 * @param name  the name of the task
+	 * @return the builder 
+	 */
+	private static TaskBuilder createTaskBuilder(final String name) {
+		final TaskDefinition taskDefinition = Home.getApp().getDefinitionSpace().resolve(name, TaskDefinition.class);
+		return Task.builder(taskDefinition);
+	}
+
+	/**
+	 * Execute la tache TK_IMPORT_PERSONS.
+	 * @param dtc io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.Person> 
+	*/
+	public void importPersons(final io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.Person> dtc) {
+		final Task task = createTaskBuilder("TK_IMPORT_PERSONS")
+				.addValue("DTC", dtc)
+				.build();
+		getTaskManager().execute(task);
+	}
+
 }

vertigo-demo-vega/src/main/javagen/io/vertigo/pandora/dao/persons/PersonsPAO.java

@@ -40,17 +40,6 @@ private static TaskBuilder createTaskBuilder(final String name) {
 		return Task.builder(taskDefinition);
 	}
 
-	/**
-	 * Execute la tache TK_IMPORT_PERSONS.
-	 * @param dtc io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.Person> 
-	*/
-	public void importPersons(final io.vertigo.dynamo.domain.model.DtList<io.vertigo.pandora.domain.persons.Person> dtc) {
-		final Task task = createTaskBuilder("TK_IMPORT_PERSONS")
-				.addValue("DTC", dtc)
-				.build();
-		getTaskManager().execute(task);
-	}
-
 	/**
 	 * Execute la tache TK_LOAD_ACTOR_ROLE_LINK.
 	 * @param movId Long 

vertigo-demo-vega/src/main/javagen/io/vertigo/pandora/domain/movies/Dummy.java

@@ -14,8 +14,6 @@ public final class Dummy implements DtObject {
 	private static final long serialVersionUID = 1L;
 
 	private Long value;
-
-
 
 	/**
 	 * Champ : DATA.