jlengrand/jreleaser
1
0
Fork 0
mirror of https://github.com/jlengrand/jreleaser.git synced 2026-03-10 08:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[upload] Rename artifactories to artifactory. Fixes #163

Browse Source
This commit is contained in:
Andres Almiray
2021-05-21 19:12:00 +02:00
parent fba772aa73
commit 23dab934cc
7 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/jreleaser-model/src/main/java/org/jreleaser/model/Upload.java
View File

@@ -32,13 +32,13 @@ import static org.jreleaser.util.StringUtils.isBlank;
* @since 0.3.0
*/
public class Upload implements Domain, EnabledAware {
private final Map<String, Artifactory> artifactories = new LinkedHashMap<>();
private final Map<String, Artifactory> artifactory = new LinkedHashMap<>();
private final Map<String, HttpUploader> http = new LinkedHashMap<>();
private Boolean enabled;
void setAll(Upload assemble) {
this.enabled = assemble.enabled;
setArtifactories(assemble.artifactories);
setArtifactory(assemble.artifactory);
setHttp(assemble.http);
}
@@ -58,22 +58,22 @@ public class Upload implements Domain, EnabledAware {
}
public List<Artifactory> getActiveArtifactories() {
return artifactories.values().stream()
return artifactory.values().stream()
.filter(Artifactory::isEnabled)
.collect(Collectors.toList());
}
public Map<String, Artifactory> getArtifactories() {
return artifactories;
public Map<String, Artifactory> getArtifactory() {
return artifactory;
}
public void setArtifactories(Map<String, Artifactory> artifactories) {
this.artifactories.clear();
this.artifactories.putAll(artifactories);
public void setArtifactory(Map<String, Artifactory> artifactory) {
this.artifactory.clear();
this.artifactory.putAll(artifactory);
}
public void addArtifactory(Artifactory artifactory) {
this.artifactories.put(artifactory.getType(), artifactory);
this.artifactory.put(artifactory.getType(), artifactory);
}
public Artifactory findArtifactory(String name) {
@@ -81,14 +81,14 @@ public class Upload implements Domain, EnabledAware {
throw new JReleaserException("Artifactory name must not be blank");
}
if (artifactories.containsKey(name)) {
return artifactories.get(name);
if (artifactory.containsKey(name)) {
return artifactory.get(name);
}
throw new JReleaserException("Artifactory '" + name + "' not found");
}
public List<HttpUploader> getActiveHttp() {
public List<HttpUploader> getActiveHttps() {
return http.values().stream()
.filter(HttpUploader::isEnabled)
.collect(Collectors.toList());
@@ -124,7 +124,7 @@ public class Upload implements Domain, EnabledAware {
Map<String, Object> map = new LinkedHashMap<>();
map.put("enabled", isEnabled());
List<Map<String, Object>> artifactory = this.artifactories.values()
List<Map<String, Object>> artifactory = this.artifactory.values()
.stream()
.filter(d -> full || d.isEnabled())
.map(d -> d.asMap(full))
@@ -144,7 +144,7 @@ public class Upload implements Domain, EnabledAware {
public <A extends Uploader> Map<String, A> findUploadersByType(String uploaderName) {
switch (uploaderName) {
case Artifactory.NAME:
return (Map<String, A>) artifactories;
return (Map<String, A>) artifactory;
case HttpUploader.NAME:
return (Map<String, A>) http;
}
@@ -155,7 +155,7 @@ public class Upload implements Domain, EnabledAware {
public <A extends Uploader> Collection<A> findAllUploaders() {
List<A> uploaders = new ArrayList<>();
uploaders.addAll((List<A>) getActiveArtifactories());
uploaders.addAll((List<A>) getActiveHttp());
uploaders.addAll((List<A>) getActiveHttps());
return uploaders;
}
}

11
core/jreleaser-model/src/main/java/org/jreleaser/model/validation/ArtifactoryValidator.java
View File

@@ -35,14 +35,11 @@ import static org.jreleaser.util.StringUtils.isNotBlank;
public abstract class ArtifactoryValidator extends Validator {
public static void validateArtifactory(JReleaserContext context, JReleaserContext.Mode mode, Errors errors) {
context.getLogger().debug("artifactory");
Map<String, Artifactory> artifactories = context.getModel().getUpload().getArtifactories();
Map<String, Artifactory> artifactory = context.getModel().getUpload().getArtifactory();
for (Map.Entry<String, Artifactory> e : artifactories.entrySet()) {
Artifactory artifactory = e.getValue();
if (isBlank(artifactory.getName())) {
artifactory.setName(e.getKey());
}
validateArtifactory(context, mode, artifactory, errors);
for (Map.Entry<String, Artifactory> e : artifactory.entrySet()) {
e.getValue().setName(e.getKey());
validateArtifactory(context, mode, e.getValue(), errors);
}
}

2
core/jreleaser-model/src/main/java/org/jreleaser/model/validation/UploadersValidator.java
View File

@@ -38,7 +38,7 @@ public abstract class UploadersValidator extends Validator {
if (!upload.isEnabledSet()) {
upload.setEnabled(!upload.getActiveArtifactories().isEmpty() ||
!upload.getActiveHttp().isEmpty());
!upload.getActiveHttps().isEmpty());
}
}
}

2
plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/dsl/Upload.groovy
View File

@@ -30,7 +30,7 @@ import org.gradle.api.provider.Property
interface Upload {
Property<Boolean> getEnabled()
NamedDomainObjectContainer<Artifactory> getArtifactories()
NamedDomainObjectContainer<Artifactory> getArtifactory()
NamedDomainObjectContainer<Http> getHttp()
}

12
plugins/jreleaser-gradle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/internal/dsl/UploadImpl.groovy
View File

@@ -38,19 +38,19 @@ import java.util.stream.Collectors
@CompileStatic
class UploadImpl implements Upload {
final Property<Boolean> enabled
final NamedDomainObjectContainer<ArtifactoryImpl> artifactories
final NamedDomainObjectContainer<ArtifactoryImpl> artifactory
final NamedDomainObjectContainer<HttpImpl> http
@Inject
UploadImpl(ObjectFactory objects) {
enabled = objects.property(Boolean).convention(true)
artifactories = objects.domainObjectContainer(ArtifactoryImpl, new NamedDomainObjectFactory<ArtifactoryImpl>() {
artifactory = objects.domainObjectContainer(ArtifactoryImpl, new NamedDomainObjectFactory<ArtifactoryImpl>() {
@Override
ArtifactoryImpl create(String name) {
ArtifactoryImpl artifactory = objects.newInstance(ArtifactoryImpl, objects)
artifactory.name = name
return artifactory
ArtifactoryImpl a = objects.newInstance(ArtifactoryImpl, objects)
a.name = name
return a
}
})
@@ -68,7 +68,7 @@ class UploadImpl implements Upload {
org.jreleaser.model.Upload toModel() {
org.jreleaser.model.Upload upload = new org.jreleaser.model.Upload()
upload.artifactories = (artifactories.toList().stream()
upload.artifactory = (artifactory.toList().stream()
.collect(Collectors.toMap(
{ ArtifactoryImpl a -> a.name },
{ ArtifactoryImpl a -> a.toModel() })) as Map<String, Artifactory>)

14
plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/Upload.java
View File

@@ -25,13 +25,13 @@ import java.util.Map;
* @since 0.3.0
*/
public class Upload implements EnabledAware {
private final Map<String, Artifactory> artifactories = new LinkedHashMap<>();
private final Map<String, Artifactory> artifactory = new LinkedHashMap<>();
private final Map<String, Http> http = new LinkedHashMap<>();
private Boolean enabled;
void setAll(Upload assemble) {
this.enabled = assemble.enabled;
setArtifactories(assemble.artifactories);
setArtifactory(assemble.artifactory);
}
@Override
@@ -49,13 +49,13 @@ public class Upload implements EnabledAware {
return enabled != null;
}
public Map<String, Artifactory> getArtifactories() {
return artifactories;
public Map<String, Artifactory> getArtifactory() {
return artifactory;
}
public void setArtifactories(Map<String, Artifactory> artifactories) {
this.artifactories.clear();
this.artifactories.putAll(artifactories);
public void setArtifactory(Map<String, Artifactory> artifactory) {
this.artifactory.clear();
this.artifactory.putAll(artifactory);
}
public Map<String, Http> getHttp() {

6
plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java
View File

@@ -291,14 +291,14 @@ public final class JReleaserModelConverter {
private static org.jreleaser.model.Upload convertUpload(Upload upload) {
org.jreleaser.model.Upload u = new org.jreleaser.model.Upload();
if (upload.isEnabledSet()) u.setEnabled(upload.isEnabled());
u.setArtifactories(convertArtifactories(upload.getArtifactories()));
u.setArtifactory(convertArtifactory(upload.getArtifactory()));
u.setHttp(convertHttp(upload.getHttp()));
return u;
}
private static Map<String, org.jreleaser.model.Artifactory> convertArtifactories(Map<String, Artifactory> artifactories) {
private static Map<String, org.jreleaser.model.Artifactory> convertArtifactory(Map<String, Artifactory> artifactory) {
Map<String, org.jreleaser.model.Artifactory> map = new LinkedHashMap<>();
for (Map.Entry<String, Artifactory> e : artifactories.entrySet()) {
for (Map.Entry<String, Artifactory> e : artifactory.entrySet()) {
e.getValue().setName(e.getKey());
map.put(e.getKey(), convertArtifactory(e.getValue()));
}