-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/dev'
- Loading branch information
Showing
35 changed files
with
582 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
api/src/main/java/org/jfrog/artifactory/client/model/FederatedMember.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package org.jfrog.artifactory.client.model; | ||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| /** | ||
| * @author Siva Singaravelan | ||
| * @since 01/05/2022 | ||
| */ | ||
| public class FederatedMember { | ||
| private String url; | ||
| private boolean enabled; | ||
|
|
||
| public void setUrl(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public void setEnabled(boolean enabled) { | ||
| this.enabled = enabled; | ||
| } | ||
|
|
||
| @JsonCreator | ||
| public FederatedMember(@JsonProperty("url") String url, @JsonProperty("enabled") boolean enabled) { | ||
| this.url = url; | ||
| this.enabled = enabled; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| public boolean isEnabled() { | ||
| return enabled; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
|
|
||
| FederatedMember federatedMember = (FederatedMember) o; | ||
|
|
||
| return url.equals(federatedMember.url) ; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return 31 * url.hashCode(); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "FederatedMember{" + | ||
| "url='" + url + '\'' + | ||
| ", enabled='" + enabled + '\'' + | ||
| '}'; | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
api/src/main/java/org/jfrog/artifactory/client/model/FederatedRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package org.jfrog.artifactory.client.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * @author Siva Singaravelan | ||
| * @since 01/07/2022 | ||
| */ | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public interface FederatedRepository extends Repository, NonVirtualRepository { | ||
|
|
||
| List<FederatedMember> getMembers(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
api/src/main/java/org/jfrog/artifactory/client/model/builder/FederatedRepositoryBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package org.jfrog.artifactory.client.model.builder; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import org.jfrog.artifactory.client.model.FederatedMember; | ||
| import org.jfrog.artifactory.client.model.FederatedRepository; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * @author Siva Singaravelan | ||
| * @since 13/08/12 | ||
| */ | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public interface FederatedRepositoryBuilder extends NonVirtualRepositoryBuilder<FederatedRepositoryBuilder, FederatedRepository> { | ||
|
|
||
| FederatedRepositoryBuilder members(List<FederatedMember> members); | ||
|
|
||
| List<FederatedMember> getMembers(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| currentVersion=2.10.0 | ||
| currentVersion=2.10.x-SNAPSHOT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.