홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
42ac51f3 1 parent 1d7c9cbe

Make fields private to get classes immutable 

Change-Id: Ib2d6c013b8c027b2ddc6a7d1cb204627a2dd7b19
Inline Side-by-side
Showing 4 changed files with 16 additions and 8 deletions
...@@ -69,15 +69,15 @@ public final class ContinuousResource implements Resource { ...@@ -69,15 +69,15 @@ public final class ContinuousResource implements Resource {
69 69
70 @Override 70 @Override
71 public List<Object> components() { 71 public List<Object> components() {
72 - return id.components; 72 + return id.components();
73 } 73 }
74 74
75 @Override 75 @Override
76 public Object last() { 76 public Object last() {
77 - if (id.components.isEmpty()) { 77 + if (id.components().isEmpty()) {
78 return null; 78 return null;
79 } 79 }
80 - return id.components.get(id.components.size() - 1); 80 + return id.components().get(id.components().size() - 1);
81 } 81 }
82 82
83 @Override 83 @Override
......
...@@ -30,7 +30,7 @@ import static com.google.common.base.Preconditions.checkNotNull; ...@@ -30,7 +30,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
30 */ 30 */
31 @Beta 31 @Beta
32 public final class ContinuousResourceId extends ResourceId { 32 public final class ContinuousResourceId extends ResourceId {
33 - final ImmutableList<Object> components; 33 + private final ImmutableList<Object> components;
34 34
35 // for printing purpose only (used in toString() implementation) 35 // for printing purpose only (used in toString() implementation)
36 private final String name; 36 private final String name;
...@@ -45,6 +45,10 @@ public final class ContinuousResourceId extends ResourceId { ...@@ -45,6 +45,10 @@ public final class ContinuousResourceId extends ResourceId {
45 this.name = last.getSimpleName(); 45 this.name = last.getSimpleName();
46 } 46 }
47 47
48 + ImmutableList<Object> components() {
49 + return components;
50 + }
51 +
48 /** 52 /**
49 * {@inheritDoc} 53 * {@inheritDoc}
50 * 54 *
......
...@@ -65,15 +65,15 @@ public final class DiscreteResource implements Resource { ...@@ -65,15 +65,15 @@ public final class DiscreteResource implements Resource {
65 65
66 @Override 66 @Override
67 public List<Object> components() { 67 public List<Object> components() {
68 - return id.components; 68 + return id.components();
69 } 69 }
70 70
71 @Override 71 @Override
72 public Object last() { 72 public Object last() {
73 - if (id.components.isEmpty()) { 73 + if (id.components().isEmpty()) {
74 return null; 74 return null;
75 } 75 }
76 - return id.components.get(id.components.size() - 1); 76 + return id.components().get(id.components().size() - 1);
77 } 77 }
78 78
79 @Override 79 @Override
......
...@@ -31,7 +31,7 @@ import static com.google.common.base.Preconditions.checkNotNull; ...@@ -31,7 +31,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
31 */ 31 */
32 @Beta 32 @Beta
33 public final class DiscreteResourceId extends ResourceId { 33 public final class DiscreteResourceId extends ResourceId {
34 - final ImmutableList<Object> components; 34 + private final ImmutableList<Object> components;
35 35
36 DiscreteResourceId(ImmutableList<Object> components) { 36 DiscreteResourceId(ImmutableList<Object> components) {
37 this.components = components; 37 this.components = components;
...@@ -41,6 +41,10 @@ public final class DiscreteResourceId extends ResourceId { ...@@ -41,6 +41,10 @@ public final class DiscreteResourceId extends ResourceId {
41 this.components = ImmutableList.of(); 41 this.components = ImmutableList.of();
42 } 42 }
43 43
44 + ImmutableList<Object> components() {
45 + return components;
46 + }
47 +
44 @Override 48 @Override
45 public DiscreteResourceId child(Object child) { 49 public DiscreteResourceId child(Object child) {
46 checkArgument(!(child instanceof Class<?>)); 50 checkArgument(!(child instanceof Class<?>));
......