Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove code smells and increase code coverage
[nonrtric.git]
/
policy-agent
/
src
/
main
/
java
/
org
/
oransc
/
policyagent
/
repository
/
Ric.java
diff --git
a/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java
b/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java
index
4169150
..
6eece5e
100644
(file)
--- a/
policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java
+++ b/
policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java
@@
-20,11
+20,14
@@
package org.oransc.policyagent.repository;
package org.oransc.policyagent.repository;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.Map;
import java.util.Vector;
-
+import lombok.Getter;
+import lombok.Setter;
import org.oransc.policyagent.clients.A1Client.A1ProtocolType;
import org.oransc.policyagent.configuration.RicConfig;
import org.oransc.policyagent.clients.A1Client.A1ProtocolType;
import org.oransc.policyagent.configuration.RicConfig;
@@
-33,10
+36,15
@@
import org.oransc.policyagent.configuration.RicConfig;
*/
public class Ric {
private final RicConfig ricConfig;
*/
public class Ric {
private final RicConfig ricConfig;
+ private final List<String> managedElementIds;
+
private RicState state = RicState.UNDEFINED;
private Map<String, PolicyType> supportedPolicyTypes = new HashMap<>();
private RicState state = RicState.UNDEFINED;
private Map<String, PolicyType> supportedPolicyTypes = new HashMap<>();
+ @Getter
+ @Setter
private A1ProtocolType protocolVersion = A1ProtocolType.UNKNOWN;
private A1ProtocolType protocolVersion = A1ProtocolType.UNKNOWN;
+
/**
* Creates the Ric. Initial state is {@link RicState.NOT_INITIATED}.
*
/**
* Creates the Ric. Initial state is {@link RicState.NOT_INITIATED}.
*
@@
-44,22
+52,23
@@
public class Ric {
*/
public Ric(RicConfig ricConfig) {
this.ricConfig = ricConfig;
*/
public Ric(RicConfig ricConfig) {
this.ricConfig = ricConfig;
+ this.managedElementIds = new ArrayList<>(ricConfig.managedElementIds());
}
public String name() {
return ricConfig.name();
}
}
public String name() {
return ricConfig.name();
}
- public Ric
State state
() {
- return
state
;
+ public Ric
Config getConfig
() {
+ return
this.ricConfig
;
}
}
- public
void setState(RicState newState
) {
-
state = newS
tate;
+ public
synchronized RicState getState(
) {
+
return this.s
tate;
}
}
- public
RicConfig getConfig(
) {
-
return this.ricConfig
;
+ public
synchronized void setState(RicState state
) {
+
this.state = state
;
}
/**
}
/**
@@
-67,8
+76,8
@@
public class Ric {
*
* @return a vector containing the nodes managed by this Ric.
*/
*
* @return a vector containing the nodes managed by this Ric.
*/
- public
Vector
<String> getManagedElementIds() {
- return
ricConfig.managedElementIds()
;
+ public
synchronized Collection
<String> getManagedElementIds() {
+ return
managedElementIds
;
}
/**
}
/**
@@
-77,8
+86,8
@@
public class Ric {
* @param managedElementId the node name to check.
* @return true if the given node is managed by this Ric.
*/
* @param managedElementId the node name to check.
* @return true if the given node is managed by this Ric.
*/
- public boolean isManaging(String managedElementId) {
- return
ricConfig.managedElementIds()
.contains(managedElementId);
+ public
synchronized
boolean isManaging(String managedElementId) {
+ return
managedElementIds
.contains(managedElementId);
}
/**
}
/**
@@
-86,9
+95,9
@@
public class Ric {
*
* @param managedElementId the node to add.
*/
*
* @param managedElementId the node to add.
*/
- public void addManagedElement(String managedElementId) {
- if (!
ricConfig.managedElementIds()
.contains(managedElementId)) {
-
ricConfig.managedElementIds()
.add(managedElementId);
+ public
synchronized
void addManagedElement(String managedElementId) {
+ if (!
managedElementIds
.contains(managedElementId)) {
+
managedElementIds
.add(managedElementId);
}
}
}
}
@@
-97,8
+106,8
@@
public class Ric {
*
* @param managedElementId the node to remove.
*/
*
* @param managedElementId the node to remove.
*/
- public void removeManagedElement(String managedElementId) {
-
ricConfig.managedElementIds()
.remove(managedElementId);
+ public
synchronized
void removeManagedElement(String managedElementId) {
+
managedElementIds
.remove(managedElementId);
}
/**
}
/**
@@
-106,12
+115,12
@@
public class Ric {
*
* @return the policy types supported by this Ric in an unmodifiable list.
*/
*
* @return the policy types supported by this Ric in an unmodifiable list.
*/
- public Collection<PolicyType> getSupportedPolicyTypes() {
- return
supportedPolicyTypes.values(
);
+ public
synchronized
Collection<PolicyType> getSupportedPolicyTypes() {
+ return
new Vector<>(supportedPolicyTypes.values()
);
}
}
- public Collection<String> getSupportedPolicyTypeNames() {
- return
supportedPolicyTypes.keySet(
);
+ public
synchronized
Collection<String> getSupportedPolicyTypeNames() {
+ return
new Vector<>(supportedPolicyTypes.keySet()
);
}
/**
}
/**
@@
-119,14
+128,14
@@
public class Ric {
*
* @param type the policy type to support.
*/
*
* @param type the policy type to support.
*/
- public void addSupportedPolicyType(PolicyType type) {
+ public
synchronized
void addSupportedPolicyType(PolicyType type) {
supportedPolicyTypes.put(type.name(), type);
}
/**
* Removes all policy type as supported by this Ric.
*/
supportedPolicyTypes.put(type.name(), type);
}
/**
* Removes all policy type as supported by this Ric.
*/
- public void clearSupportedPolicyTypes() {
+ public
synchronized
void clearSupportedPolicyTypes() {
supportedPolicyTypes.clear();
}
supportedPolicyTypes.clear();
}
@@
-137,22
+146,22
@@
public class Ric {
*
* @return true if the given type is supported by this Ric, false otherwise.
*/
*
* @return true if the given type is supported by this Ric, false otherwise.
*/
- public boolean isSupportingType(String typeName) {
+ public
synchronized
boolean isSupportingType(String typeName) {
return supportedPolicyTypes.containsKey(typeName);
}
@Override
return supportedPolicyTypes.containsKey(typeName);
}
@Override
- public String toString() {
+ public
synchronized
String toString() {
return Ric.class.getSimpleName() + ": " + "name: " + name() + ", state: " + state + ", baseUrl: "
return Ric.class.getSimpleName() + ": " + "name: " + name() + ", state: " + state + ", baseUrl: "
- + ricConfig.baseUrl() + ", managedNodes: " +
ricConfig.managedElementIds()
;
+ + ricConfig.baseUrl() + ", managedNodes: " +
managedElementIds
;
}
/**
* Represents the states possible for a Ric.
*/
}
/**
* Represents the states possible for a Ric.
*/
- public
static
enum RicState {
+ public enum RicState {
/**
/**
- * The agent view of the
agent may be inconsistent
+ * The agent view of the
Ric may be inconsistent.
*/
UNDEFINED,
/**
*/
UNDEFINED,
/**
@@
-160,18
+169,8
@@
public class Ric {
*/
IDLE,
/**
*/
IDLE,
/**
- * The
Ric states are recovered
+ * The
agent is synchronizing the view of the Ric.
*/
*/
-
RECOVER
ING
+
SYNCHRONIZ
ING
}
}
-
- public A1ProtocolType getProtocolVersion() {
- return protocolVersion;
- }
-
- public void setProtocolVersion(A1ProtocolType version) {
- protocolVersion = version;
-
- }
-
}
}