Skip to content

Commit

Permalink
update e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
man-zhang committed Mar 27, 2023
1 parent 1349b58 commit b84f649
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public class BarTableEntity {
@ManyToOne
RootTableEntity rootTableEntity;

@JsonIgnore
@ManyToMany(mappedBy = "activedBarTableEntities")
Set<FooTableEntity> inNodeC;

public static BarTableEntity withName(RootTableEntity rootTableEntity, String barName) {
BarTableEntity barTableEntity = new BarTableEntity();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ public class FooTableEntity {
RootTableEntity rootTableEntity;

@ManyToMany(fetch = FetchType.EAGER)
Set<BarTableEntity> activedBarTableEntities = new HashSet<BarTableEntity>();
Set<BarTableEntity> activatedBarTableEntities = new HashSet<BarTableEntity>();

public Set<BarTableEntity> getActivedBars() {
return activedBarTableEntities;
public Set<BarTableEntity> getActivatedBars() {
return activatedBarTableEntities;
}

public Set<String> availableBars() {
Expand Down Expand Up @@ -59,8 +59,8 @@ public void setRootTableDto(RootTableEntity rootTableEntity) {
this.rootTableEntity = rootTableEntity;
}

public Set<String> activedBars() {
return collectBarNames(activedBarTableEntities);
public Set<String> activatedBars() {
return collectBarNames(activatedBarTableEntities);
}

public Boolean isValid() {
Expand All @@ -72,25 +72,25 @@ public void setValid(Boolean valid) {
}

public void active(BarTableEntity barTableEntity) {
activedBarTableEntities.add(barTableEntity);
activatedBarTableEntities.add(barTableEntity);

}

public void deactive(BarTableEntity barTableEntity) {
activedBarTableEntities.remove(barTableEntity);
public void deactivate(BarTableEntity barTableEntity) {
activatedBarTableEntities.remove(barTableEntity);
}

public void active(String barName) {
BarTableEntity barTableEntity = rootTableEntity.findRootBarByName(barName);
active(barTableEntity);
}

public void deactive(String barName) {
public void deactivate(String barName) {
BarTableEntity barTableEntity = rootTableEntity.findRootBarByName(barName);
deactive(barTableEntity);
deactivate(barTableEntity);
}

public boolean hasActiveBars(String barName) {
return activedBars().contains(barName);
return activatedBars().contains(barName);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class RootTableEntity {
@OneToMany(mappedBy = "rootTableEntity", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
Set<BarTableEntity> rootBarTableEntities = new HashSet<BarTableEntity>();

@JsonProperty("nodeBTableDto")
@JsonProperty("barTableDto")
public Set<BarTableEntity> getBarTableDtos() {
return rootBarTableEntities;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ public class FooService {


@RequestMapping(value = "/root/{rootName}/foo/{fooName}/bar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON)
public String getFooActivedBars(@PathVariable("rootName") String rootName, @PathVariable("fooName") String fooName) {
public String getFooActivatedBars(@PathVariable("rootName") String rootName, @PathVariable("fooName") String fooName) {
FooTableEntity nodeC = fooRepository.findNodeCTableEntitiesByRootTableEntityNameAndName(rootName, fooName);
List<String> nodeBNames = new ArrayList<String>();
for (BarTableEntity nodeB : nodeC.getActivedBars()) {
for (BarTableEntity nodeB : nodeC.getActivatedBars()) {
nodeBNames.add(nodeB.getName());
}
if (nodeBNames.isEmpty())
Expand Down

0 comments on commit b84f649

Please sign in to comment.