ImlCopy: metadata -> step (#1415)

* ImlCopy: metadata -> step Signed-off-by: qGYdXbY2 <[email protected]> * TargetType Space Signed-off-by: qGYdXbY2 <[email protected]> --------- Signed-off-by: qGYdXbY2 <[email protected]>
heremaps · Dec 11, 2024 · 8bd1cbf · 8bd1cbf
1 parent eda8220
commit 8bd1cbf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/steps/compiler/SpaceCopy.java b/xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/steps/compiler/SpaceCopy.java
@@ -125,7 +125,7 @@ public static CompilationStepGraph compileSteps(String sourceId, String targetId
 
     CopySpacePost postCopySpace = new CopySpacePost().withSpaceId(targetSpaceId)
                                                      .withJobId(jobId)
-                                                     .withTargetType(targetType);
+                                                     .withOutputMetadata(Map.of(targetType, targetSpaceId));
 
     startGraph.addExecution(postCopySpace);
 
@@ -141,7 +141,7 @@ public CompilationStepGraph compile(Job job) {
                         job.getId(),
                         ((DatasetDescription.Space<?>) job.getSource()).getFilters(),
                         ((DatasetDescription.Space<?>) job.getSource()).getVersionRef(),
-                        job.getTarget().getClass().getSimpleName() );
+                        "Space" );
 
   }
 }
diff --git a/...obs/xyz-job-steps/src/main/java/com/here/xyz/jobs/steps/impl/transport/CopySpacePost.java b/...obs/xyz-job-steps/src/main/java/com/here/xyz/jobs/steps/impl/transport/CopySpacePost.java
@@ -84,9 +84,6 @@ public class CopySpacePost extends SpaceBasedStep<CopySpacePost> {
   @JsonView({Internal.class, Static.class})
   private long copiedByteSize = 0;
 
-  @JsonView({Internal.class, Static.class})
-  private String targetType = "Space";
-
   public long getCopiedByteSize() {
     return copiedByteSize;
   }
@@ -99,20 +96,6 @@ public long getFetchedVersion() {
     return fetchedVersion;
   }
 
-  public String getTargetType() {
-    return targetType;
-  }
-
-  public void setTargetType(String targetType) {
-    this.targetType = targetType;
-  }
-
-  public CopySpacePost withTargetType(String targetType) {
-    setTargetType( targetType );
-    return this;
-  }
-
-
   @Override
   public List<Load> getNeededResources() {
     try {
@@ -203,7 +186,6 @@ public void execute() throws Exception {
     infoLog(STEP_EXECUTE, this,String.format("Get stats for version %d - %s", fetchedVersion, getSpaceId() )); 
 
     FeatureStatistics statistics = getCopiedFeatures(fetchedVersion);
-    statistics.withMetadata( getTargetType(), getSpaceId() );  // key = [Layer(iml)|Space(xyz)] 
 
     infoLog(STEP_EXECUTE, this,"Job Statistics: bytes=" + statistics.getByteSize() + " rows=" + statistics.getFeatureCount());
     registerOutputs(List.of(statistics), true);