Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added transient List of ProjectVersions and set Metrics in Project #2581

Merged
merged 2 commits into from
Jun 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/main/java/org/dependencytrack/model/Project.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.github.packageurl.MalformedPackageURLException;
import com.github.packageurl.PackageURL;
import org.dependencytrack.resources.v1.serializers.CustomPackageURLSerializer;

import javax.jdo.annotations.Column;
import javax.jdo.annotations.Element;
import javax.jdo.annotations.Extension;
Expand All @@ -45,8 +44,8 @@
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent;
import javax.jdo.annotations.PrimaryKey;
import javax.jdo.annotations.Unique;
import javax.jdo.annotations.Serialized;
import javax.jdo.annotations.Unique;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
Expand Down Expand Up @@ -260,6 +259,8 @@ public enum FetchGroup {

private transient ProjectMetrics metrics;

private transient List<ProjectVersion> versions;

@JsonIgnore
private transient List<Component> dependencyGraph;

Expand Down Expand Up @@ -460,6 +461,14 @@ public void setMetrics(ProjectMetrics metrics) {
this.metrics = metrics;
}

public List<ProjectVersion> getVersions() {
return versions;
}

public void setVersions(List<ProjectVersion> versions) {
this.versions = versions;
}

public List<Team> getAccessTeams() {
return accessTeams;
}
Expand Down Expand Up @@ -499,13 +508,13 @@ public String toString() {
return sb.toString();
}
}

private final static class BooleanDefaultTrueSerializer extends JsonSerializer<Boolean> {

@Override
public void serialize(Boolean value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
gen.writeBoolean(value != null ? value : true);
}

}
}
63 changes: 63 additions & 0 deletions src/main/java/org/dependencytrack/model/ProjectVersion.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
* This file is part of Dependency-Track.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* SPDX-License-Identifier: Apache-2.0
* Copyright (c) Steve Springett. All Rights Reserved.
*/
package org.dependencytrack.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import java.io.Serializable;
import java.util.UUID;

/**
* Value object holding UUID and version for a project
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
public class ProjectVersion implements Serializable {

private static final long serialVersionUID = 1L;

private UUID uuid;

private String version;

public ProjectVersion() {
this.uuid = null;
this.version = null;
}

public ProjectVersion(UUID uuid, String version) {
this.uuid = uuid;
this.version = version;

}

public void setUuid(UUID uuid) {
this.uuid = uuid;
}

public UUID getUuid() {
return uuid;
}

public void setVersion(String version) {
this.version = version;
}

public String getVersion() {
return version;
}
}
Loading