Skip to content

Commit

Permalink
Release 5.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
APiankouski authored Sep 3, 2024
2 parents da5155b + a9ef30d commit f8edbf3
Show file tree
Hide file tree
Showing 17 changed files with 81 additions and 55 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ on:

env:
GH_USER_NAME: github.actor
SCRIPTS_VERSION: 5.10.0
BOM_VERSION: 5.11.7
RELEASE_VERSION: 5.11.1
SCRIPTS_VERSION: 5.12.0
BOM_VERSION: 5.12.1
RELEASE_VERSION: 5.12.0

jobs:
release:
Expand Down
13 changes: 6 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'io.spring.dependency-management' version '1.0.8.RELEASE'
id 'java'
id 'java-library'
}

project.ext {
Expand Down Expand Up @@ -30,19 +31,17 @@ repositories {

dependencyManagement {
imports {
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.github.reportportal:commons-bom:b929af1e08')
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
}
}

dependencies {
if (releaseMode) {
compile 'com.epam.reportportal:commons-model'
compile 'com.epam.reportportal:commons-rules'
compile 'com.epam.reportportal:commons-dao'
implementation 'com.epam.reportportal:commons-dao'
api 'com.epam.reportportal:commons'
} else {
compile 'com.github.reportportal:commons-dao:4d7eaa4841'
compile 'com.github.reportportal:commons-model:83f012f'
compile 'com.epam.reportportal:commons-rules'
implementation 'com.github.reportportal:commons-dao:823f284'
api 'com.github.reportportal:commons:24ea814'
}
compile 'org.pf4j:pf4j:3.10.0'

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=5.11.2
version=5.12.0
description=EPAM Report portal. Plugin extension APIs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.epam.reportportal.extension;

import com.epam.reportportal.rules.commons.validation.BusinessRule;
import com.epam.reportportal.rules.exception.ErrorType;
import com.epam.ta.reportportal.commons.ReportPortalUser;
import com.epam.ta.reportportal.commons.validation.BusinessRule;
import com.epam.ta.reportportal.entity.user.UserRole;
import com.epam.ta.reportportal.ws.model.ErrorType;
import org.springframework.security.core.context.SecurityContextHolder;

import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,18 @@

public enum IntegrationGroupEnum {

BTS,
NOTIFICATION,
AUTH,
OTHER;
BTS,
NOTIFICATION,
AUTH,
OTHER,
IMPORT;

public static Optional<IntegrationGroupEnum> findByName(String name) {
return Arrays.stream(IntegrationGroupEnum.values()).filter(i -> i.name().equalsIgnoreCase(name)).findAny();
}
public static Optional<IntegrationGroupEnum> findByName(String name) {
return Arrays.stream(IntegrationGroupEnum.values()).filter(i -> i.name().equalsIgnoreCase(name))
.findAny();
}

public static boolean isPresent(String name) {
return findByName(name).isPresent();
}
public static boolean isPresent(String name) {
return findByName(name).isPresent();
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.epam.reportportal.extension;

import com.epam.reportportal.rules.commons.validation.BusinessRule;
import com.epam.reportportal.rules.exception.ReportPortalException;
import com.epam.ta.reportportal.commons.ReportPortalUser;
import com.epam.ta.reportportal.commons.validation.BusinessRule;
import com.epam.ta.reportportal.dao.ProjectRepository;
import com.epam.ta.reportportal.entity.project.Project;
import com.epam.ta.reportportal.entity.project.ProjectRole;
import com.epam.ta.reportportal.exception.ReportPortalException;
import com.epam.ta.reportportal.ws.model.ErrorType;
import com.epam.reportportal.rules.exception.ErrorType;

import static java.util.Optional.ofNullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.epam.reportportal.extension;

import com.epam.reportportal.rules.commons.validation.BusinessRule;
import com.epam.reportportal.rules.commons.validation.Suppliers;
import com.epam.reportportal.rules.exception.ReportPortalException;
import com.epam.ta.reportportal.commons.ReportPortalUser;
import com.epam.ta.reportportal.commons.validation.BusinessRule;
import com.epam.ta.reportportal.commons.validation.Suppliers;
import com.epam.ta.reportportal.dao.ProjectRepository;
import com.epam.ta.reportportal.entity.project.Project;
import com.epam.ta.reportportal.exception.ReportPortalException;
import com.epam.ta.reportportal.ws.model.ErrorType;
import com.epam.reportportal.rules.exception.ErrorType;
import org.springframework.security.core.context.SecurityContextHolder;

import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
*/
package com.epam.reportportal.extension.bugtracking;

import com.epam.reportportal.model.externalsystem.PostFormField;
import com.epam.reportportal.model.externalsystem.PostTicketRQ;
import com.epam.reportportal.model.externalsystem.Ticket;
import com.epam.ta.reportportal.entity.integration.Integration;
import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
import java.util.Optional;
import org.pf4j.ExtensionPoint;

import java.util.List;
import java.util.Optional;

/**
* Generic interface to access third-party bug tracking systems
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
package com.epam.reportportal.extension.bugtracking;

import com.epam.reportportal.extension.util.FileNameExtractor;
import com.epam.reportportal.model.externalsystem.PostFormField;
import com.epam.reportportal.model.externalsystem.PostTicketRQ;
import com.epam.ta.reportportal.binary.impl.AttachmentDataStoreService;
import com.epam.ta.reportportal.dao.LogRepository;
import com.epam.ta.reportportal.dao.TestItemRepository;
import com.epam.ta.reportportal.entity.log.Log;
import com.epam.ta.reportportal.filesystem.DataEncoder;
import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.epam.reportportal.extension.classloader;

import com.epam.ta.reportportal.commons.validation.BusinessRule;
import com.epam.ta.reportportal.ws.model.ErrorType;
import com.epam.reportportal.rules.commons.validation.BusinessRule;
import com.epam.reportportal.rules.exception.ErrorType;
import org.springframework.stereotype.Service;

import java.util.LinkedHashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.epam.reportportal.extension.event;

import com.epam.ta.reportportal.ws.model.launch.cluster.ClusterInfoResource;

import com.epam.reportportal.model.launch.cluster.ClusterInfoResource;
import java.util.Collection;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@

package com.epam.reportportal.extension.event;

import com.epam.ta.reportportal.ws.model.launch.LaunchResource;

import com.epam.ta.reportportal.ws.reporting.LaunchResource;
import java.util.Collection;

/**
* @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
*/
// TODO: replace with different dto object to unwire commons-reporting lib
public class GetLaunchResourceCollectionEvent extends EntityCollectionEvent<LaunchResource> {
public GetLaunchResourceCollectionEvent(Collection<LaunchResource> entities) {
super(entities);
}

public GetLaunchResourceCollectionEvent(Collection<LaunchResource> entities) {
super(entities);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,23 @@ public class LaunchFinishedPluginEvent extends LaunchEvent<Long> {

private final Long projectId;

private String launchLink;

public LaunchFinishedPluginEvent(Long source, Long projectId) {
super(source);
this.projectId = projectId;
}

public LaunchFinishedPluginEvent(Long source, Long projectId, String launchLink) {
this(source, projectId);
this.launchLink = launchLink;
}

public Long getProjectId() {
return projectId;
}

public String getLaunchLink() {
return launchLink;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
package com.epam.reportportal.extension.util;

import com.epam.ta.reportportal.commons.validation.Suppliers;
import com.epam.ta.reportportal.exception.ReportPortalException;
import com.epam.ta.reportportal.ws.model.ErrorType;

import com.epam.reportportal.rules.commons.validation.Suppliers;
import com.epam.reportportal.rules.exception.ReportPortalException;
import com.epam.reportportal.rules.exception.ErrorType;
import javax.validation.ConstraintViolation;
import javax.validation.Path;
import java.util.Iterator;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.epam.reportportal.extension.util;

public class CommonConstants {

private CommonConstants() {
//static only
}

public static final String DESCRIPTION_KEY = "description";
public static final String METADATA = "metadata";
public static final String BINARY_DATA = "binaryData";
public static final String IS_INTEGRATIONS_ALLOWED = "isIntegrationsAllowed";

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
package com.epam.reportportal.extension.util;

import com.epam.ta.reportportal.commons.validation.Suppliers;
import com.epam.ta.reportportal.exception.ReportPortalException;
import com.epam.ta.reportportal.ws.model.ErrorType;
import com.epam.reportportal.rules.commons.validation.Suppliers;
import com.epam.reportportal.rules.exception.ReportPortalException;
import com.epam.reportportal.rules.exception.ErrorType;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
package com.epam.reportportal.extension.util;

import com.epam.ta.reportportal.exception.ReportPortalException;
import com.epam.ta.reportportal.ws.model.ErrorType;

import com.epam.reportportal.rules.exception.ReportPortalException;
import com.epam.reportportal.rules.exception.ErrorType;
import javax.validation.Validation;
import javax.validation.Validator;
import java.util.List;
Expand All @@ -42,7 +42,8 @@ public static <T> void validate(T entity) {
.map(it -> it.getPropertyPath() + " " + it.getMessage())
.collect(Collectors.toList());
if (!errors.isEmpty()) {
throw new ReportPortalException(ErrorType.BAD_REQUEST_ERROR, String.join(VALIDATION_EXCEPTION_DELIMITER, errors));
throw new ReportPortalException(
ErrorType.BAD_REQUEST_ERROR, String.join(VALIDATION_EXCEPTION_DELIMITER, errors));
}
}
}

0 comments on commit f8edbf3

Please sign in to comment.