service -> services

pom.xml

@@ -6,7 +6,7 @@
 
  <groupId>fr.insee.knowledge</groupId>
  <artifactId>knowledge</artifactId>
- <version>0.4.4</version>
+ <version>0.4.5</version>
  <packaging>jar</packaging>
  <name>Knowledge-Back-Office</name>
  <description>Back-office services for Knowledge</description>

src/main/java/fr/insee/knowledge/constants/Constants.java

@@ -29,7 +29,7 @@ private Constants() {
  public static final String idProductFiled = "products";
  public static final String gsbpmField = "gsbpm";
  public static final String labelField = "label";
- public static final String serviceField = "service";
+ public static final String serviceField = "services";
  public static final String descriptionField = "description";
  public static final String dispoField = "dispo";
  public static final String tasksField = "tasks";

src/main/java/fr/insee/knowledge/domain/Function.java

@@ -11,9 +11,9 @@ public class Function extends GenericIDLabel {
  private List<ProductOrGsbpm> products;
  private List<Task> tasks;
 
- private Service serviceBpmn;
+ private Services servicesBpmn;
 
- public Function(String id, String label, String description, int dispo, ProductOrGsbpm gsbpm, String idProduct, List<GenericIDLabel> users, List<ProductOrGsbpm> tools, List<Task> tasks, Service serviceBpmn) {
+ public Function(String id, String label, String description, int dispo, ProductOrGsbpm gsbpm, String idProduct, List<GenericIDLabel> users, List<ProductOrGsbpm> tools, List<Task> tasks, Services servicesBpmn) {
  super(id, label);
  this.description = description;
  this.dispo = dispo;
@@ -22,7 +22,7 @@ public Function(String id, String label, String description, int dispo, ProductO
  this.users = users;
  this.products = products;
  this.tasks = tasks;
- this.serviceBpmn = serviceBpmn;
+ this.servicesBpmn = servicesBpmn;
  }
 
  public Function() {
@@ -85,11 +85,11 @@ public void setTasks(List<Task> tasks) {
  this.tasks = tasks;
  }
 
- public Service getServiceBpmn() {
- return serviceBpmn;
+ public Services getServiceBpmn() {
+ return servicesBpmn;
  }
 
- public void setServiceBpmn(Service service) {
- this.serviceBpmn = service;
+ public void setServiceBpmn(Services services) {
+ this.servicesBpmn = services;
  }
 }

src/main/java/fr/insee/knowledge/domain/Services.java

@@ -0,0 +1,33 @@
+package fr.insee.knowledge.domain;
+
+public class Services extends GenericIDLabel {
+
+ private Services services;
+ private String description;
+
+ public Services(Services services, String description, String id, String label) {
+ super(id, label);
+ this.services = services;
+ this.description = description;
+ }
+
+ public Services() {
+ }
+
+ public Services getService() {
+ return services;
+ }
+
+ public void setService(Services services) {
+ this.services = services;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+}

src/main/java/fr/insee/knowledge/service/impl/ImportFunctionServiceImpl.java

@@ -6,7 +6,7 @@
 import fr.insee.knowledge.constants.Constants;
 import fr.insee.knowledge.dao.FunctionDAO;
 import fr.insee.knowledge.domain.Function;
-import fr.insee.knowledge.domain.Service;
+import fr.insee.knowledge.domain.Services;
 import fr.insee.knowledge.service.ImportFunctionService;
 
 import java.io.IOException;
@@ -37,31 +37,31 @@ private List<Function> getListFunctionsFromJsonNode(JsonNode rootNode) throws Js
  List<Function> listFunction = new ArrayList<>();
  if (rootNode.isArray()) {
  for (JsonNode node : rootNode) {
- recursiveMapping(listFunction, node, new Service());
+ recursiveMapping(listFunction, node, new Services());
  }
  }
  return listFunction;
  }
 
- private void recursiveMapping(List<Function> functionList, JsonNode jsonNode, Service currentService) throws JsonProcessingException {
- currentService.setId(jsonNode.get(Constants.idField).asText());
- currentService.setLabel(jsonNode.get(Constants.labelField).asText());
+ private void recursiveMapping(List<Function> functionList, JsonNode jsonNode, Services currentServices) throws JsonProcessingException {
+ currentServices.setId(jsonNode.get(Constants.idField).asText());
+ currentServices.setLabel(jsonNode.get(Constants.labelField).asText());
 
  JsonNode functionNodeArray = jsonNode.get(Constants.functionField);
  if (functionNodeArray != null) {
  for (JsonNode functionNode : functionNodeArray) {
  Function function = mapper.treeToValue(functionNode, Function.class);
- function.setServiceBpmn(currentService);
+ function.setServiceBpmn(currentServices);
  functionList.add(function);
  }
  }
  JsonNode node = jsonNode.get(Constants.serviceField);
  if (node != null) {
  for (JsonNode serviceNode : node) {
- Service service = new Service();
+ Services services = new Services();
  //TODO test if service exist in database
- service.setService(currentService);
- recursiveMapping(functionList, serviceNode, service);
+ services.setService(currentServices);
+ recursiveMapping(functionList, serviceNode, services);
  }
  }
  }