Skip to content
Snippets Groups Projects

Iss #87 - Move validation logic to validation service in prep for webhook updates

Merged Iss #87 - Move validation logic to validation service in prep for webhook updates
Merged Martin Lowe requested to merge (removed):malowe/master/87 into master
10 files
+ 545
550
Compare changes
  • Side-by-side
  • Inline
Files
10
@@ -11,10 +11,8 @@
**********************************************************************/
package org.eclipsefoundation.git.eca.api.models;
import javax.annotation.Nullable;
import org.eclipsefoundation.git.eca.model.GitUser;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
@@ -38,7 +36,6 @@ public abstract class EclipseUser {
public abstract boolean getIsCommitter();
@Nullable
@JsonIgnore
public abstract Boolean getIsBot();
@@ -49,8 +46,14 @@ public abstract class EclipseUser {
* @return a stubbed Eclipse user bot object.
*/
public static EclipseUser createBotStub(GitUser user) {
return EclipseUser.builder().setUid(0).setName(user.getName()).setMail(user.getMail())
.setECA(ECA.builder().build()).setIsBot(true).build();
return EclipseUser
.builder()
.setUid(0)
.setName(user.getName())
.setMail(user.getMail())
.setECA(ECA.builder().build())
.setIsBot(true)
.build();
}
public static Builder builder() {
@@ -71,7 +74,7 @@ public abstract class EclipseUser {
public abstract Builder setIsCommitter(boolean isCommitter);
@JsonIgnore
public abstract Builder setIsBot(@Nullable Boolean isBot);
public abstract Builder setIsBot(boolean isBot);
public abstract EclipseUser build();
}
@@ -79,11 +82,9 @@ public abstract class EclipseUser {
@AutoValue
@JsonDeserialize(builder = AutoValue_EclipseUser_ECA.Builder.class)
public abstract static class ECA {
@Nullable
public abstract Boolean getSigned();
public abstract boolean getSigned();
@Nullable
public abstract Boolean getCanContributeSpecProject();
public abstract boolean getCanContributeSpecProject();
public static Builder builder() {
return new AutoValue_EclipseUser_ECA.Builder().setCanContributeSpecProject(false).setSigned(false);
@@ -92,9 +93,9 @@ public abstract class EclipseUser {
@AutoValue.Builder
@JsonPOJOBuilder(withPrefix = "set")
public abstract static class Builder {
public abstract Builder setSigned(@Nullable Boolean signed);
public abstract Builder setSigned(boolean signed);
public abstract Builder setCanContributeSpecProject(@Nullable Boolean canContributeSpecProject);
public abstract Builder setCanContributeSpecProject(boolean canContributeSpecProject);
public abstract ECA build();
}
Loading