-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Environment representation in domain refactored
- Loading branch information
Showing
18 changed files
with
176 additions
and
179 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
28 changes: 0 additions & 28 deletions
28
judge-d-server/src/main/java/com/hltech/judged/server/domain/SpaceServiceVersion.java
This file was deleted.
Oops, something went wrong.
75 changes: 17 additions & 58 deletions
75
judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/Environment.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 |
---|---|---|
@@ -1,80 +1,39 @@ | ||
package com.hltech.judged.server.domain.environment; | ||
|
||
import com.google.common.collect.SetMultimap; | ||
import com.hltech.judged.server.domain.ServiceVersion; | ||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
import java.util.HashSet; | ||
import java.util.Set; | ||
import java.util.stream.Collectors; | ||
|
||
import static com.google.common.collect.HashMultimap.create; | ||
|
||
@Getter | ||
@RequiredArgsConstructor | ||
public class Environment { | ||
|
||
public static final String DEFAULT_NAMESPACE = "default"; | ||
|
||
private final String name; | ||
private final SetMultimap<String, ServiceVersion> serviceVersions; | ||
|
||
public Environment(String name, SetMultimap<String, ServiceVersion> serviceVersions) { | ||
this.name = name; | ||
this.serviceVersions = serviceVersions; | ||
} | ||
|
||
public Environment(String name, Set<ServiceVersion> serviceVersions) { | ||
this.name = name; | ||
this.serviceVersions = create(); | ||
this.serviceVersions.putAll(DEFAULT_NAMESPACE, serviceVersions); | ||
} | ||
|
||
public String getName() { | ||
return this.name; | ||
} | ||
private final Set<Space> spaces; | ||
|
||
public Set<String> getSpaceNames() { | ||
return serviceVersions.keySet(); | ||
} | ||
|
||
public Set<ServiceVersion> getServices(String space) { | ||
return serviceVersions.get(space); | ||
} | ||
|
||
public Set<ServiceVersion> getAllServices() { | ||
return serviceVersions.values().stream() | ||
return spaces.stream() | ||
.map(Space::getName) | ||
.collect(Collectors.toUnmodifiableSet()); | ||
} | ||
|
||
public static Environment empty(String environmentName) { | ||
return new Environment(environmentName, new HashSet<>()); | ||
public Set<Service> getServices(String spaceName) { | ||
return spaces.stream() | ||
.filter(space -> space.getName().equals(spaceName)) | ||
.findAny() | ||
.map(Space::getServices) | ||
.orElse(new HashSet<>()); | ||
} | ||
|
||
public static EnvironmentBuilder builder(String name) { | ||
return new EnvironmentBuilder(name); | ||
} | ||
|
||
public static class EnvironmentBuilder { | ||
|
||
private final String name; | ||
// <space, serviceVersion> | ||
private final SetMultimap<String, ServiceVersion> serviceVersions = create(); | ||
|
||
private EnvironmentBuilder(String name) { | ||
this.name = name; | ||
} | ||
|
||
public EnvironmentBuilder withServiceVersion(String space, ServiceVersion serviceVersion) { | ||
this.serviceVersions.put(space, serviceVersion); | ||
return this; | ||
} | ||
|
||
public EnvironmentBuilder withServiceVersions(String space, Set<ServiceVersion> serviceVersions) { | ||
this.serviceVersions.putAll(space, serviceVersions); | ||
return this; | ||
} | ||
|
||
public Environment build() { | ||
return new Environment(this.name, this.serviceVersions); | ||
} | ||
|
||
public Set<Service> getAllServices() { | ||
return spaces.stream() | ||
.flatMap(space -> space.getServices().stream()) | ||
.collect(Collectors.toUnmodifiableSet()); | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/Service.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,13 @@ | ||
package com.hltech.judged.server.domain.environment; | ||
|
||
import lombok.EqualsAndHashCode; | ||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Getter | ||
@RequiredArgsConstructor | ||
@EqualsAndHashCode | ||
public class Service { | ||
private final String name; | ||
private final String version; | ||
} |
15 changes: 15 additions & 0 deletions
15
judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/Space.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 com.hltech.judged.server.domain.environment; | ||
|
||
import lombok.EqualsAndHashCode; | ||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
import java.util.Set; | ||
|
||
@Getter | ||
@RequiredArgsConstructor | ||
@EqualsAndHashCode | ||
public class Space { | ||
private final String name; | ||
private final Set<Service> services; | ||
} |
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
24 changes: 24 additions & 0 deletions
24
.../java/com/hltech/judged/server/infrastructure/persistence/environment/ServiceVersion.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,24 @@ | ||
package com.hltech.judged.server.infrastructure.persistence.environment; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.EqualsAndHashCode; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
import javax.persistence.Access; | ||
import javax.persistence.AccessType; | ||
import javax.persistence.Embeddable; | ||
|
||
import static lombok.AccessLevel.PROTECTED; | ||
|
||
@Embeddable | ||
@Getter | ||
@EqualsAndHashCode | ||
@NoArgsConstructor(access = PROTECTED) | ||
@AllArgsConstructor | ||
@Access(AccessType.FIELD) | ||
public class ServiceVersion { | ||
private String space; | ||
private String name; | ||
private String version; | ||
} |
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
Oops, something went wrong.