NCL-9197 Add ability to import RPMs

src/main/java/com/redhat/red/build/koji/model/json/BuildDescription.java

@@ -262,6 +262,23 @@ public Builder withMavenInfoAndType( ProjectVersionRef gav )
             return this;
         }
 
+        public Builder withRpmInfoAndType(ProjectVersionRef gav )
+        {
+            if ( target.extraInfo == null )
+            {
+                target.extraInfo = new BuildExtraInfo();
+            }
+            target.extraInfo.setMavenRpm(gav.toString());
+
+            if (target.extraInfo.getTypeInfo() == null)
+            {
+                target.extraInfo.setTypeInfo( new TypeInfoExtraInfo() );
+            }
+            target.extraInfo.getTypeInfo().setRpmTypeInfoExtraInfo( EmptyTypeInfoExtraInfo.getInstance() );
+
+            return this;
+        }
+
         public Builder withNpmInfoAndType( NpmPackageRef nv )
         {
             NpmExtraInfo npmExtraInfo = new NpmExtraInfo( nv.getName(), nv.getVersion().toString() );
@@ -278,7 +295,7 @@ public Builder withNpmInfoAndType( NpmPackageRef nv )
             {
                 target.extraInfo.setTypeInfo( new TypeInfoExtraInfo() );
             }
-            target.extraInfo.getTypeInfo().setNpmTypeInfoExtraInfo( NpmTypeInfoExtraInfo.getInstance() );
+            target.extraInfo.getTypeInfo().setNpmTypeInfoExtraInfo( EmptyTypeInfoExtraInfo.getInstance() );
 
             return this;
         }

src/main/java/com/redhat/red/build/koji/model/json/BuildExtraInfo.java

@@ -16,9 +16,8 @@
 package com.redhat.red.build.koji.model.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
 import org.commonjava.atlas.npm.ident.ref.NpmPackageRef;
 import org.commonjava.rwx.anno.DataKey;
@@ -34,6 +33,7 @@
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.IMAGE_INFO;
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.IMPORT_INITIATOR;
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.MAVEN_INFO;
+import static com.redhat.red.build.koji.model.json.KojiJsonConstants.MAVEN_RPM;
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.NPM_INFO;
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.OSBS_BUILD;
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.SCM_TAG;
@@ -87,6 +87,10 @@ public class BuildExtraInfo
     @DataKey( SCM_TAG )
     private String scmTag;
 
+    @JsonProperty( MAVEN_RPM )
+    @DataKey( MAVEN_RPM )
+    private String mavenRpm;
+
     @JsonProperty( OSBS_BUILD )
     @DataKey( OSBS_BUILD )
     private OsbsBuildExtraInfo osbsBuild;
@@ -265,12 +269,12 @@ public boolean equals( Object o )
         }
 
         BuildExtraInfo that = (BuildExtraInfo ) o;
-        return Objects.equals( mavenExtraInfo, that.mavenExtraInfo ) && Objects.equals( npmExtraInfo, that.npmExtraInfo ) && Objects.equals( imageExtraInfo, that.imageExtraInfo ) && Objects.equals( externalBuildId, that.externalBuildId ) && Objects.equals( buildSystem, that.buildSystem ) && Objects.equals( externalBuildUrl, that.externalBuildUrl ) && Objects.equals( importInitiator, that.importInitiator ) && Objects.equals( scmTag, that.scmTag ) && Objects.equals( typeInfo, that.typeInfo ) && Objects.equals( containerKojiTaskId, that.containerKojiTaskId ) && Objects.equals( filesystemKojiTaskId, that.filesystemKojiTaskId ) && Objects.equals( osbsBuild, that.osbsBuild ) && Objects.equals( submitter, that.submitter );
+        return Objects.equals( mavenExtraInfo, that.mavenExtraInfo ) && Objects.equals( npmExtraInfo, that.npmExtraInfo ) && Objects.equals( imageExtraInfo, that.imageExtraInfo ) && Objects.equals( externalBuildId, that.externalBuildId ) && Objects.equals( buildSystem, that.buildSystem ) && Objects.equals( externalBuildUrl, that.externalBuildUrl ) && Objects.equals( importInitiator, that.importInitiator ) && Objects.equals( scmTag, that.scmTag ) && Objects.equals( mavenRpm, that.mavenRpm )&& Objects.equals( typeInfo, that.typeInfo ) && Objects.equals( containerKojiTaskId, that.containerKojiTaskId ) && Objects.equals( filesystemKojiTaskId, that.filesystemKojiTaskId ) && Objects.equals( osbsBuild, that.osbsBuild ) && Objects.equals( submitter, that.submitter );
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash( mavenExtraInfo, npmExtraInfo, imageExtraInfo, externalBuildId, buildSystem, externalBuildUrl, importInitiator, scmTag, typeInfo, containerKojiTaskId, filesystemKojiTaskId, osbsBuild, submitter );
+        return Objects.hash( mavenExtraInfo, npmExtraInfo, imageExtraInfo, externalBuildId, buildSystem, externalBuildUrl, importInitiator, scmTag, mavenRpm, typeInfo, containerKojiTaskId, filesystemKojiTaskId, osbsBuild, submitter );
     }
 
     @Override
@@ -287,9 +291,18 @@ public String toString()
                 ", externalBuildUrl='" + externalBuildUrl + '\'' +
                 ", importInitiator='" + importInitiator + '\'' +
                 ", scmTag='" + scmTag + '\'' +
+                ", mavenRpm='" + mavenRpm + '\'' +
                 ", typeInfo=" + typeInfo +
                 ", osbsBuild=" + osbsBuild +
                 ", submitter='" + submitter + '\'' +
                 '}';
     }
+
+    public String getMavenRpm() {
+        return mavenRpm;
+    }
+
+    public void setMavenRpm(String mavenRpm) {
+        this.mavenRpm = mavenRpm;
+    }
 }

src/main/java/com/redhat/red/build/koji/model/json/BuildOutput.java

@@ -276,12 +276,18 @@ public Builder withNpmInfoAndType( NpmPackageRef ref )
             target.outputType = StandardOutputType.npm.getName();
 
             NpmExtraInfo npmExtraInfo = new NpmExtraInfo( ref.getName(), ref.getVersion().toString() );
-            TypeInfoExtraInfo typeInfo = new TypeInfoExtraInfo( NpmTypeInfoExtraInfo.getInstance() );
+            TypeInfoExtraInfo typeInfo = new TypeInfoExtraInfo( EmptyTypeInfoExtraInfo.getInstance() );
             target.extraInfo = new FileExtraInfo( npmExtraInfo, typeInfo );
 
             return this;
         }
 
+        public Builder withRpmInfoAndType()
+        {
+            target.outputType = StandardOutputType.rpm.getName();
+            return this;
+        }
+
         public Builder withRemoteSourcesInfoAndType( List<RemoteSourcesExtraInfo> sourcesExtraInfo )
         {
             target.outputType = StandardOutputType.remote_sources.getName();

src/main/java/com/redhat/red/build/koji/model/json/BuildSource.java

@@ -94,4 +94,12 @@ public int hashCode()
         result = 31 * result + ( getRevision() != null ? getRevision().hashCode() : 0 );
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "BuildSource{" +
+                "url='" + url + '\'' +
+                ", revision='" + revision + '\'' +
+                '}';
+    }
 }

src/main/java/com/redhat/red/build/koji/model/json/NpmTypeInfoExtraInfo.java → src/main/java/com/redhat/red/build/koji/model/json/EmptyTypeInfoExtraInfo.java

@@ -21,26 +21,30 @@
  * Created by pkocandr on 06/22/21
  */
 @StructPart
-public class NpmTypeInfoExtraInfo
-{
-    private static NpmTypeInfoExtraInfo instance;
+public class EmptyTypeInfoExtraInfo {
+    private static EmptyTypeInfoExtraInfo instance;
 
-    public NpmTypeInfoExtraInfo()
-    {
+    public EmptyTypeInfoExtraInfo() {
     }
 
-    public static NpmTypeInfoExtraInfo getInstance() {
-        if (instance == null)
-        {
+    public static EmptyTypeInfoExtraInfo getInstance() {
+        if (instance == null) {
             // if instance is null, initialize
-            instance = new NpmTypeInfoExtraInfo();
+            instance = new EmptyTypeInfoExtraInfo();
         }
         return instance;
     }
 
     @Override
-    public String toString()
-    {
-        return "NpmTypeInfoExtraInfo{}";
+    public String toString() {
+        return "EmptyTypeInfoExtraInfo{}";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof EmptyTypeInfoExtraInfo)) {
+            return false;
+        }
+        return true;
     }
 }

src/main/java/com/redhat/red/build/koji/model/json/FileExtraInfo.java

@@ -16,9 +16,8 @@
 package com.redhat.red.build.koji.model.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
 import org.commonjava.rwx.anno.DataKey;
 import org.commonjava.rwx.anno.StructPart;
@@ -46,18 +45,18 @@ public class FileExtraInfo
     @DataKey( TYPEINFO )
     private TypeInfoExtraInfo typeInfo;
 
-    public FileExtraInfo( @JsonProperty( MAVEN_INFO ) MavenExtraInfo mavenExtraInfo )
-    {
-        this.mavenExtraInfo = mavenExtraInfo;
-    }
-
     public FileExtraInfo( @JsonProperty( NPM_INFO ) NpmExtraInfo npmExtraInfo,
             @JsonProperty( TYPEINFO ) TypeInfoExtraInfo typeInfo )
     {
         this.npmExtraInfo = npmExtraInfo;
         this.typeInfo = typeInfo;
     }
 
+    public FileExtraInfo( @JsonProperty( MAVEN_INFO ) MavenExtraInfo mavenExtraInfo )
+    {
+        this.mavenExtraInfo = mavenExtraInfo;
+    }
+
     public FileExtraInfo( @JsonProperty( TYPEINFO ) TypeInfoExtraInfo typeInfo )
     {
         this.typeInfo = typeInfo;
@@ -154,7 +153,7 @@ else if ( getNpmExtraInfo() != null )
         {
             return "FileExtraInfo{" + "npmExtraInfo=" + npmExtraInfo + "}";
         }
-        else if ( getMavenExtraInfo() != null )
+        else if ( getTypeInfo() != null )
         {
             return "FileExtraInfo{" + "typeInfo=" + typeInfo + "}";
         }

src/main/java/com/redhat/red/build/koji/model/json/KojiJsonConstants.java

@@ -84,6 +84,8 @@ public final class KojiJsonConstants
 
     public static final String MAVEN_OUTPUT_TYPE = "maven";
 
+    public static final String MAVEN_RPM = "maven_rpm";
+
     public static final String MD5_CHECKSUM_TYPE = "md5";
 
     public static final String METADATA_VERSION = "metadata_version";

src/main/java/com/redhat/red/build/koji/model/json/StandardArchitecture.java

@@ -20,5 +20,5 @@
  */
 public enum StandardArchitecture
 {
-    i386, x86_64, noarch;
+    i386, x86_64, noarch, src;
 }

src/main/java/com/redhat/red/build/koji/model/json/StandardOutputType.java

@@ -24,8 +24,8 @@ public enum StandardOutputType
     maven("maven"),
     remote_sources("remote-sources"),
     REMOTE_SOURCE_FILE("remote-source-file"),
-    npm("npm");
-
+    npm("npm"),
+    rpm("rpm");
     private String name;
 
     StandardOutputType(String name) {

src/main/java/com/redhat/red/build/koji/model/json/TypeInfoExtraInfo.java

@@ -31,6 +31,7 @@
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.NPM_TYPE_INFO;
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.REMOTE_SOURCES;
 import static com.redhat.red.build.koji.model.json.KojiJsonConstants.REMOTE_SOURCE_FILE;
+import static com.redhat.red.build.koji.model.json.KojiJsonConstants.RPM;
 
 /**
  * Created by jbrazdil on 2021-04-08.
@@ -49,7 +50,11 @@ public class TypeInfoExtraInfo
 
     @JsonProperty( NPM_TYPE_INFO )
     @DataKey( NPM_TYPE_INFO )
-    private NpmTypeInfoExtraInfo npmTypeInfoExtraInfo;
+    private EmptyTypeInfoExtraInfo npmTypeInfoExtraInfo;
+
+    @JsonProperty( RPM )
+    @DataKey( RPM )
+    private EmptyTypeInfoExtraInfo rpmTypeInfoExtraInfo;
 
     @JsonProperty( IMAGE_INFO )
     @DataKey( IMAGE_INFO )
@@ -61,7 +66,7 @@ public class TypeInfoExtraInfo
 
     @JsonCreator
     public TypeInfoExtraInfo( @JsonProperty( REMOTE_SOURCE_FILE ) RemoteSourceFileExtraInfo sourceFileInfo,
-                              @JsonProperty( NPM_TYPE_INFO ) NpmTypeInfoExtraInfo npm,
+                              @JsonProperty( NPM_TYPE_INFO ) EmptyTypeInfoExtraInfo npm,
                               @JsonProperty( REMOTE_SOURCES ) List<RemoteSourcesExtraInfo> remoteSourcesExtraInfo )
     {
         this.remoteSourceFileExtraInfo = sourceFileInfo;
@@ -75,7 +80,7 @@ public TypeInfoExtraInfo( @JsonProperty( REMOTE_SOURCES ) List<RemoteSourcesExtr
         this.remoteSourcesExtraInfo = sourcesExtraInfo;
     }
 
-    public TypeInfoExtraInfo( @JsonProperty( NPM_TYPE_INFO ) NpmTypeInfoExtraInfo npm )
+    public TypeInfoExtraInfo( @JsonProperty( NPM_TYPE_INFO ) EmptyTypeInfoExtraInfo npm )
     {
         this.npmTypeInfoExtraInfo = npm;
     }
@@ -104,16 +109,26 @@ public void setRemoteSourceFileExtraInfo( RemoteSourceFileExtraInfo remoteSource
         this.remoteSourceFileExtraInfo = remoteSourceFileExtraInfo;
     }
 
-    public NpmTypeInfoExtraInfo getNpmTypeInfoExtraInfo()
+    public EmptyTypeInfoExtraInfo getNpmTypeInfoExtraInfo()
     {
         return npmTypeInfoExtraInfo;
     }
 
-    public void setNpmTypeInfoExtraInfo( NpmTypeInfoExtraInfo npmTypeInfoExtraInfo )
+    public void setNpmTypeInfoExtraInfo( EmptyTypeInfoExtraInfo npmTypeInfoExtraInfo )
     {
         this.npmTypeInfoExtraInfo = npmTypeInfoExtraInfo;
     }
 
+    public EmptyTypeInfoExtraInfo getRpmTypeInfoExtraInfo()
+    {
+        return rpmTypeInfoExtraInfo;
+    }
+
+    public void setRpmTypeInfoExtraInfo( EmptyTypeInfoExtraInfo rpmTypeInfoExtraInfo )
+    {
+        this.rpmTypeInfoExtraInfo = rpmTypeInfoExtraInfo;
+    }
+
     public ImageExtraInfo getImageExtraInfo()
     {
         return imageExtraInfo;
@@ -143,17 +158,17 @@ public boolean equals( Object o )
         }
 
         TypeInfoExtraInfo that = (TypeInfoExtraInfo) o;
-        return Objects.equals( remoteSourcesExtraInfo, that.remoteSourcesExtraInfo ) && Objects.equals( remoteSourceFileExtraInfo, that.remoteSourceFileExtraInfo ) && Objects.equals( npmTypeInfoExtraInfo, that.npmTypeInfoExtraInfo ) && Objects.equals( imageExtraInfo, that.imageExtraInfo ) && Objects.equals( icmExtraInfo, that.icmExtraInfo );
+        return Objects.equals( remoteSourcesExtraInfo, that.remoteSourcesExtraInfo ) && Objects.equals( remoteSourceFileExtraInfo, that.remoteSourceFileExtraInfo ) && Objects.equals( npmTypeInfoExtraInfo, that.npmTypeInfoExtraInfo ) && Objects.equals( rpmTypeInfoExtraInfo, that.rpmTypeInfoExtraInfo )&& Objects.equals( imageExtraInfo, that.imageExtraInfo ) && Objects.equals( icmExtraInfo, that.icmExtraInfo );
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash( remoteSourcesExtraInfo, remoteSourceFileExtraInfo, npmTypeInfoExtraInfo, imageExtraInfo, icmExtraInfo );
+        return Objects.hash( remoteSourcesExtraInfo, remoteSourceFileExtraInfo, npmTypeInfoExtraInfo, rpmTypeInfoExtraInfo, imageExtraInfo, icmExtraInfo );
     }
 
     @Override
     public String toString() {
-        return "TypeInfoExtraInfo{remoteSourcesExtraInfo=" + remoteSourcesExtraInfo + ", remoteSourceFileExtraInfo=" + remoteSourceFileExtraInfo + ", npmTypeInfoExtraInfo=" + npmTypeInfoExtraInfo + ", imageExtraInfo=" + imageExtraInfo + ", icmExtraInfo=" + icmExtraInfo + '}';
+        return "TypeInfoExtraInfo{remoteSourcesExtraInfo=" + remoteSourcesExtraInfo + ", remoteSourceFileExtraInfo=" + remoteSourceFileExtraInfo + ", npmTypeInfoExtraInfo=" + npmTypeInfoExtraInfo + ", rpmTypeInfoExtraInfo=" + rpmTypeInfoExtraInfo + ", imageExtraInfo=" + imageExtraInfo + ", icmExtraInfo=" + icmExtraInfo + '}';
     }
 }