diff --git a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java index ac47442..b67231f 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java @@ -214,7 +214,7 @@ public class EmailUtilsImpl implements EmailUtils { "We received a request to add the following interface: \n\n" + "Base URL: " + repositoryInterface.getBaseurl() + "\n" + "Set: " + repositoryInterface.getAccessSet() + "\n" + - "Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + + "Selected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + "to " + repository.getEoscDatasourceType() + "[" + repository.getOfficialname() + "].\n"; if (comment != null) @@ -245,7 +245,7 @@ public class EmailUtilsImpl implements EmailUtils { "We received a request to add the following interface: \n\n" + "Base URL: " + repositoryInterface.getBaseurl() + "\n" + "Set: " + repositoryInterface.getAccessSet() + "\n" + - "Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + + "Selected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + "to " + repository.getEoscDatasourceType() + "[" + repository.getOfficialname() + "].\n"; if (comment != null) { @@ -285,8 +285,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + "This message has been generated manually\n\n" + @@ -319,8 +319,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nDesired Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nDesired Selected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nUser Contact:" + issuerEmail + "" + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + @@ -348,8 +348,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + "This message has been generated manually\n\n" + @@ -382,8 +382,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nUser Contact:" + issuerEmail + "" + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + @@ -410,8 +410,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + "This message has been generated manually\n\n" + @@ -437,8 +437,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nUser Contact:" + issuerEmail + "" + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + @@ -467,8 +467,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + "This message has been generated manually\n\n" + @@ -496,8 +496,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\nUser Contact:" + issuerEmail + "" + "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId + "\n\n\nPlease do not reply to this email\n" + @@ -526,8 +526,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + request.getDesiredCompatibilityLevel() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + request.getDesiredCompatibilityLevel() + "\n\n\nPlease do not reply to this email\n" + "This message has been generated automatically\n\n" + "If you have any questions, write to 'helpdesk@openaire.eu'."; @@ -554,8 +554,8 @@ public class EmailUtilsImpl implements EmailUtils { "Registration identifier in OpenAIRE: " + repository.getNamespaceprefix() + "\nOfficial Name:" + repository.getOfficialname() + "\n\nBase URL: " + repositoryInterface.getBaseurl() + - "\n\nValidation Set: " + repositoryInterface.getAccessSet() + - "\n\nGuidelines: " + request.getDesiredCompatibilityLevel() + + "\n\nSet: " + repositoryInterface.getAccessSet() + + "\n\nSelected Guidelines: " + request.getDesiredCompatibilityLevel() + "\n\n\nPlease do not reply to this email\n" + "This message has been generated automatically\n\n" + "If you have any questions, write to 'helpdesk@openaire.eu'."; @@ -687,7 +687,7 @@ public class EmailUtilsImpl implements EmailUtils { "We received a request to update the following interface: \n\n" + "Base URL: " + repositoryInterface.getBaseurl() + "\n" + "Set: " + repositoryInterface.getAccessSet() + "\n" + - "Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + + "Selected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + "for " + repository.getEoscDatasourceType() + "[" + repository.getOfficialname() + "].\n"; if (comment != null) @@ -717,7 +717,7 @@ public class EmailUtilsImpl implements EmailUtils { "We received a request to update the following interface: \n\n" + "Base URL: " + repositoryInterface.getBaseurl() + "\n" + "Set: " + repositoryInterface.getAccessSet() + "\n" + - "Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + + "Selected Guidelines: " + desiredCompatibility != null ? desiredCompatibility : repositoryInterface.getCompatibilityOverride() + "\n\n" + "for " + repository.getEoscDatasourceType() + "[" + repository.getOfficialname() + "].\n"; if (comment != null) {