简柏林 / thingskit · Commits

Commit 75af05eddd5081758514f373ebbc2a4cb13f25ff

Authored by Andrew Shvayka
Committed by GitHub
2 parents bb3d8fe2 872a2065

Merge pull request #666 from volodymyr-babak/master 

Fix cache issue for relation service
Inline Side-by-side
Showing 1 changed file with 22 additions and 20 deletions
... ... @@ -82,8 +82,9 @@ public class BaseRelationService implements RelationService {
82 82 }
83 83
84 84 @Caching(evict = {
85   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"),
  85 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"),
86 86 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"),
  87 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"),
87 88 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"),
88 89 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}")
89 90 })
... ... @@ -95,8 +96,9 @@ public class BaseRelationService implements RelationService {
95 96 }
96 97
97 98 @Caching(evict = {
98   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"),
  99 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"),
99 100 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"),
  101 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"),
100 102 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"),
101 103 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}")
102 104 })
... ... @@ -108,11 +110,11 @@ public class BaseRelationService implements RelationService {
108 110 }
109 111
110 112 @Caching(evict = {
111   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"),
  113 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"),
112 114 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"),
  115 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"),
113 116 @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"),
114   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}"),
115   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}")
  117 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}")
116 118 })
117 119 @Override
118 120 public boolean deleteRelation(EntityRelation relation) {
... ... @@ -122,11 +124,11 @@ public class BaseRelationService implements RelationService {
122 124 }
123 125
124 126 @Caching(evict = {
125   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#relation.from"),
126   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type}"),
127   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#relation.to"),
128   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type}"),
129   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}")
  127 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"),
  128 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"),
  129 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"),
  130 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"),
  131 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}")
130 132 })
131 133 @Override
132 134 public ListenableFuture<Boolean> deleteRelationAsync(EntityRelation relation) {
... ... @@ -136,11 +138,11 @@ public class BaseRelationService implements RelationService {
136 138 }
137 139
138 140 @Caching(evict = {
139   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#from"),
140   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType}"),
141   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#to"),
142   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType}"),
143   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType}")
  141 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType, #typeGroup}"),
  142 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType, #typeGroup}"),
  143 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}"),
  144 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #typeGroup}"),
  145 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType, #typeGroup}")
144 146 })
145 147 @Override
146 148 public boolean deleteRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) {
... ... @@ -150,11 +152,11 @@ public class BaseRelationService implements RelationService {
150 152 }
151 153
152 154 @Caching(evict = {
153   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#from"),
154   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType}"),
155   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#to"),
156   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType}"),
157   - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType}")
  155 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType, #typeGroup}"),
  156 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType, #typeGroup}"),
  157 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}"),
  158 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #typeGroup}"),
  159 + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType, #typeGroup}")
158 160 })
159 161 @Override
160 162 public ListenableFuture<Boolean> deleteRelationAsync(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) {
... ...