Merge pull request #4035 from Coduz/fix-jobStepDefinitionSerialization

🐛 [Job] Fixed serialization of JobStepDefinition.stepProperties via REST API
eclipse · May 15, 2024 · c215cc9 · c215cc9
2 parents 1e82551 + 0e40c78
commit c215cc9
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 66 deletions.
diff --git a/...ob/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinition.java b/...ob/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinition.java
@@ -12,14 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.job.step.definition;
 
-import java.util.List;
+import org.eclipse.kapua.model.KapuaNamedEntity;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
-import org.eclipse.kapua.model.KapuaNamedEntity;
+import java.util.List;
 
 /**
  * {@link JobStepDefinition} {@link org.eclipse.kapua.model.KapuaEntity} definition.
@@ -54,8 +53,9 @@ default String getType() {
 
  void setWriterName(String writesName);
 
- <P extends JobStepProperty> List<P> getStepProperties();
+ List<JobStepProperty> getStepProperties();
 
  JobStepProperty getStepProperty(String name);
 
+ void setStepProperties(List<JobStepProperty> jobStepProperties);
 }
diff --git a/.../src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionRecord.java b/.../src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionRecord.java
@@ -12,14 +12,14 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.job.step.definition;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
 import org.eclipse.kapua.entity.EntityPropertiesReadException;
 import org.eclipse.kapua.entity.EntityPropertiesWriteException;
 import org.eclipse.kapua.model.id.KapuaId;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+
 public abstract class JobStepDefinitionRecord implements JobStepDefinition {
 
  private static final long serialVersionUID = 8163044089055983759L;
@@ -33,13 +33,13 @@ public abstract class JobStepDefinitionRecord implements JobStepDefinition {
  private List<JobStepProperty> jobStepProperties;
 
  public JobStepDefinitionRecord(KapuaId scopeId,
- String name,
- String description,
- JobStepType stepType,
- String readerName,
- String processorName,
- String writerName,
- List<JobStepProperty> jobStepProperties) {
+  String name,
+  String description,
+  JobStepType stepType,
+  String readerName,
+  String processorName,
+  String writerName,
+  List<JobStepProperty> jobStepProperties) {
  this.scopeId = scopeId;
  this.name = name;
  this.description = description;
@@ -55,74 +55,39 @@ public KapuaId getScopeId() {
  return scopeId;
  }
 
- @Override
- public void setScopeId(KapuaId scopeId) {
- this.scopeId = scopeId;
- }
-
  @Override
  public String getName() {
  return name;
  }
 
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
  @Override
  public String getDescription() {
  return description;
  }
 
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
  @Override
  public JobStepType getStepType() {
  return stepType;
  }
 
- @Override
- public void setStepType(JobStepType stepType) {
- this.stepType = stepType;
- }
-
  @Override
  public String getReaderName() {
  return readerName;
  }
 
- @Override
- public void setReaderName(String readerName) {
- this.readerName = readerName;
- }
-
  @Override
  public String getProcessorName() {
  return processorName;
  }
 
- @Override
- public void setProcessorName(String processorName) {
- this.processorName = processorName;
- }
-
  @Override
  public String getWriterName() {
  return writerName;
  }
 
  @Override
- public void setWriterName(String writerName) {
- this.writerName = writerName;
- }
-
- @Override
- public <P extends JobStepProperty> List<P> getStepProperties() {
- return (List<P>) jobStepProperties;
+ public List<JobStepProperty> getStepProperties() {
+ return jobStepProperties;
  }
 
  @Override
@@ -194,4 +159,46 @@ public void setEntityProperties(Properties props) throws EntityPropertiesWriteEx
  throw new UnsupportedOperationException();
  }
 
+ @Override
+ public void setScopeId(KapuaId scopeId) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setName(String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setDescription(String description) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setStepType(JobStepType stepType) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setReaderName(String readerName) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setProcessorName(String processorName) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setWriterName(String writerName) {
+ throw new UnsupportedOperationException();
+ }
+
+
+ @Override
+ public void setStepProperties(List<JobStepProperty> jobStepProperties) {
+ throw new UnsupportedOperationException();
+ }
+
+
 }
diff --git a/...in/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionImpl.java b/...in/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionImpl.java
@@ -181,10 +181,6 @@ public void setWriterName(String writesName) {
  this.writerName = writesName;
  }
 
- public List<JobStepDefinitionPropertyImpl> getJobStepProperties() {
- return jobStepProperties;
- }
-
  @Override
  public List<JobStepProperty> getStepProperties() {
  if (jobStepProperties == null) {
@@ -196,10 +192,17 @@ public List<JobStepProperty> getStepProperties() {
  .collect(Collectors.toList());
  }
 
- public List<JobStepDefinitionPropertyImpl> getStepPropertiesEntitites() {
- return jobStepProperties;
+ @Override
+ public JobStepProperty getStepProperty(String name) {
+ return Optional.ofNullable(getStepProperties())
+ .flatMap(jobStepProperties -> jobStepProperties
+ .stream()
+ .filter(jobStepProperty -> jobStepProperty.getName().equals(name))
+ .findAny())
+ .orElse(null);
  }
 
+ @Override
  public void setStepProperties(List<JobStepProperty> jobStepProperties) {
  this.jobStepProperties = new ArrayList<>();
 
@@ -208,14 +211,12 @@ public void setStepProperties(List<JobStepProperty> jobStepProperties) {
  }
  }
 
- @Override
- public JobStepProperty getStepProperty(String name) {
- return Optional.ofNullable(getStepProperties())
- .flatMap(jobStepProperties -> jobStepProperties
- .stream()
- .filter(jobStepProperty -> jobStepProperty.getName().equals(name))
- .findAny())
- .orElse(null);
+ public List<JobStepDefinitionPropertyImpl> getStepPropertiesEntitites() {
+ return jobStepProperties;
+ }
+
+ public List<JobStepDefinitionPropertyImpl> getJobStepProperties() {
+ return jobStepProperties;
  }
 
  /**