aboutsummaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-03-19 01:16:38 +0000
committerliamfallon <liam.fallon@est.tech>2019-03-19 01:16:38 +0000
commit923a9943a1d59a9d1e87d24490eea78fa9869de7 (patch)
tree23558e0aa07330a29b2d102740ec87785625d273 /auth
parentb804d0b81b2f6be2561b7606cf67fbad37928307 (diff)
Use Assertions class from policy-common
Change import line in all classes that use the Assertions class, there are a lot of them. Issue-ID: POLICY-1264 Change-Id: I8480264be4e36348b3fc63acf1bc36e9c9dd250b Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'auth')
-rw-r--r--auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java23
-rw-r--r--auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java27
-rw-r--r--auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java15
3 files changed, 34 insertions, 31 deletions
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java
index 6dd2f14ee..6ce1979b2 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java
@@ -1,26 +1,27 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
package org.onap.policy.apex.auth.clieditor;
-import org.onap.policy.apex.model.utilities.Assertions;
+import org.onap.policy.common.utils.validation.Assertions;
/**
* This class holds the definition of an argument of a CLI command.
@@ -106,7 +107,7 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -117,7 +118,7 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
@Override
@@ -163,15 +164,15 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> {
if (this == obj) {
return true;
}
-
+
if (obj == null) {
return false;
}
-
+
if (getClass() != obj.getClass()) {
return false;
}
-
+
CommandLineArgument other = (CommandLineArgument) obj;
if (argumentName == null) {
if (other.argumentName != null) {
@@ -180,7 +181,7 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> {
} else if (!argumentName.equals(other.argumentName)) {
return false;
}
-
+
if (description == null) {
if (other.description != null) {
return false;
@@ -188,7 +189,7 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> {
} else if (!description.equals(other.description)) {
return false;
}
-
+
return nullable == other.nullable;
}
}
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java
index beba91554..564c5320a 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -23,7 +24,7 @@ package org.onap.policy.apex.auth.clieditor;
import java.util.ArrayList;
import java.util.List;
-import org.onap.policy.apex.model.utilities.Assertions;
+import org.onap.policy.common.utils.validation.Assertions;
/**
* This class represents a single Apex CLI command that is issued to the Apex Editor Java API
@@ -188,7 +189,7 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -200,7 +201,7 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
@Override
@@ -218,15 +219,15 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> {
if (result != 0) {
return result;
}
-
+
if (!argumentList.equals(otherCommand.argumentList)) {
return (argumentList.hashCode() - otherCommand.argumentList.hashCode());
}
-
+
if (systemCommand != otherCommand.systemCommand) {
return (this.hashCode() - otherCommand.hashCode());
}
-
+
return apiMethod.compareTo(otherCommand.apiMethod);
}
@@ -250,7 +251,7 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> {
return 1;
}
}
-
+
return 0;
}
@@ -278,15 +279,15 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> {
if (this == obj) {
return true;
}
-
+
if (obj == null) {
return false;
}
-
+
if (getClass() != obj.getClass()) {
return false;
}
-
+
return this.compareTo((CommandLineCommand) obj) == 0;
}
}
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java
index c16bbf568..f6932e993 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -27,7 +28,7 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.onap.policy.apex.model.utilities.Assertions;
+import org.onap.policy.common.utils.validation.Assertions;
/**
* The Class KeywordNode holds the structure of a command keyword for the Apex CLI editor. The
@@ -202,15 +203,15 @@ public class KeywordNode implements Comparable<KeywordNode> {
if (this == obj) {
return true;
}
-
+
if (obj == null) {
return false;
}
-
+
if (getClass() != obj.getClass()) {
return false;
}
-
+
return this.compareTo((KeywordNode) obj) == 0;
}
}