diff options
Diffstat (limited to 'model/context-model/src/main')
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextAlbum.java) | 83 | ||||
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextAlbums.java) | 88 | ||||
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextModel.java) | 73 | ||||
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextSchema.java) | 84 | ||||
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextSchemas.java) | 87 | ||||
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/package-info.java) | 15 | ||||
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/handling/ContextComparer.java) | 12 | ||||
| -rw-r--r-- | model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java (renamed from model/context-model/src/main/java/org/onap/apex/model/contextmodel/handling/package-info.java) | 2 |
8 files changed, 215 insertions, 229 deletions
diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextAlbum.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java index 045ea0aba..27f9b8b9b 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextAlbum.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java @@ -5,20 +5,20 @@ * 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.apex.model.contextmodel.concepts; +package org.onap.policy.apex.model.contextmodel.concepts; import java.util.List; @@ -35,43 +35,42 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.onap.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.apex.model.basicmodel.concepts.AxConcept; -import org.onap.apex.model.basicmodel.concepts.AxKey; -import org.onap.apex.model.basicmodel.concepts.AxKeyUse; -import org.onap.apex.model.basicmodel.concepts.AxValidationMessage; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxConcept; +import org.onap.policy.apex.model.basicmodel.concepts.AxKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxKeyUse; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationMessage; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; import org.onap.policy.apex.model.utilities.Assertions; /** * This class is used to define an album of context. * <p> - * A context album is a distributed map of context that will be distributed across all process - * instances that require access to it. This class defines the schema (structure) of the items in - * the context album, whether the items on the context album are writable or not, and what the scope - * of the context album is. + * A context album is a distributed map of context that will be distributed across all process instances that require + * access to it. This class defines the schema (structure) of the items in the context album, whether the items on the + * context album are writable or not, and what the scope of the context album is. * <p> - * The structure of items (objects) the context album is defined as a schema, which is understood by - * whatever schema implementation is being used for the context album. + * The structure of items (objects) the context album is defined as a schema, which is understood by whatever schema + * implementation is being used for the context album. * <p> - * The scope of a context album is a string field, understood by whatever distribution mechanism is - * being used for the context album. The distribution mechanism uses the scope of the context album - * to decide to which executable entities a given context album is distributed. + * The scope of a context album is a string field, understood by whatever distribution mechanism is being used for the + * context album. The distribution mechanism uses the scope of the context album to decide to which executable entities + * a given context album is distributed. * <p> - * The writable flag on a context album defines whether users of a context album can write to the - * context album or just read objects from the context album. + * The writable flag on a context album defines whether users of a context album can write to the context album or just + * read objects from the context album. * <p> - * Validation checks that the album key and the context schema key are not null and that the scope - * field is not undefined and matches the regular expression {@link SCOPE_REGEXP}. + * Validation checks that the album key and the context schema key are not null and that the scope field is not + * undefined and matches the regular expression {@link SCOPE_REGEXP}. */ @Entity @Table(name = "AxContextAlbum") @XmlAccessorType(XmlAccessType.FIELD) -@XmlRootElement(name = "apexContextAlbum", namespace = "http://www.ericsson.com/apex") -@XmlType(name = "AxContextAlbum", namespace = "http://www.ericsson.com/apex", - propOrder = {"key", "scope", "isWritable", "itemSchema"}) +@XmlRootElement(name = "apexContextAlbum", namespace = "http://www.onap.org/policy/apex-pdp") +@XmlType(name = "AxContextAlbum", namespace = "http://www.onap.org/policy/apex-pdp", + propOrder = { "key", "scope", "isWritable", "itemSchema" }) public class AxContextAlbum extends AxConcept { private static final String SCOPE_STRING = "scope"; @@ -113,9 +112,9 @@ public class AxContextAlbum extends AxConcept { // @formatter:on /** - * The default constructor creates a context album with a null artifact key. The scope of the - * context album is set as {@link SCOPE_UNDEFINED}, the album is writable, and the artifact key - * of the context schema is set to the null artifact key. + * The default constructor creates a context album with a null artifact key. The scope of the context album is set + * as {@link SCOPE_UNDEFINED}, the album is writable, and the artifact key of the context schema is set to the null + * artifact key. */ public AxContextAlbum() { this(new AxArtifactKey()); @@ -126,7 +125,7 @@ public class AxContextAlbum extends AxConcept { /** * Copy constructor - * + * * @param copyConcept the concept to copy from */ public AxContextAlbum(final AxContextAlbum copyConcept) { @@ -134,9 +133,9 @@ public class AxContextAlbum extends AxConcept { } /** - * The keyed constructor creates a context album with the specified artifact key. The scope of - * the context album is set as {@link SCOPE_UNDEFINED}, the album is writable, and the artifact - * key of the context schema is set to the null artifact key. + * The keyed constructor creates a context album with the specified artifact key. The scope of the context album is + * set as {@link SCOPE_UNDEFINED}, the album is writable, and the artifact key of the context schema is set to the + * null artifact key. * * @param key the key of the context album */ @@ -168,7 +167,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKey() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() */ @Override public AxArtifactKey getKey() { @@ -178,7 +177,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKeys() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() */ @Override public List<AxKey> getKeys() { @@ -257,7 +256,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#validate(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. * basicmodel.concepts.AxValidationResult) */ @Override @@ -294,7 +293,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#clean() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() */ @Override public void clean() { @@ -306,7 +305,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#toString() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() */ @Override public String toString() { @@ -328,7 +327,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#copyTo(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. * basicmodel.concepts.AxConcept) */ @Override @@ -350,7 +349,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#hashCode() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() */ @Override public int hashCode() { @@ -366,7 +365,7 @@ public class AxContextAlbum extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) */ @Override public boolean equals(final Object obj) { diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextAlbums.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java index e48d064cb..f9d34cef6 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextAlbums.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java @@ -5,20 +5,20 @@ * 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.apex.model.contextmodel.concepts; +package org.onap.policy.apex.model.contextmodel.concepts; import java.util.List; import java.util.Map; @@ -40,33 +40,32 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.onap.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.apex.model.basicmodel.concepts.AxConcept; -import org.onap.apex.model.basicmodel.concepts.AxConceptGetter; -import org.onap.apex.model.basicmodel.concepts.AxConceptGetterImpl; -import org.onap.apex.model.basicmodel.concepts.AxKey; -import org.onap.apex.model.basicmodel.concepts.AxValidationMessage; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxConcept; +import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter; +import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetterImpl; +import org.onap.policy.apex.model.basicmodel.concepts.AxKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationMessage; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; import org.onap.policy.apex.model.utilities.Assertions; /** - * This class is a context album container and holds a map of the context albums for an entire Apex - * model. All Apex models that use context albums must have an {@link AxContextAlbums} field. The - * {@link AxContextAlbums} class implements the helper methods of the {@link AxConceptGetter} - * interface to allow {@link AxContextAlbum} instances to be retrieved by calling methods directly - * on this class without referencing the contained map. + * This class is a context album container and holds a map of the context albums for an entire Apex model. All Apex + * models that use context albums must have an {@link AxContextAlbums} field. The {@link AxContextAlbums} class + * implements the helper methods of the {@link AxConceptGetter} interface to allow {@link AxContextAlbum} instances to + * be retrieved by calling methods directly on this class without referencing the contained map. * <p> - * Validation checks that the container key is not null. An observation is issued if no context - * albums are defined in the container. If context albums do exist, they are checked to ensure that - * keys and values are not null and that the map key matches the key in the map value for all album - * entries. Each context album entry is then validated individually. + * Validation checks that the container key is not null. An observation is issued if no context albums are defined in + * the container. If context albums do exist, they are checked to ensure that keys and values are not null and that the + * map key matches the key in the map value for all album entries. Each context album entry is then validated + * individually. */ @Entity @Table(name = "AxContextAlbums") @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AxContextAlbums", namespace = "http://www.ericsson.com/apex", propOrder = {"key", "albums"}) +@XmlType(name = "AxContextAlbums", namespace = "http://www.onap.org/policy/apex-pdp", propOrder = { "key", "albums" }) public final class AxContextAlbums extends AxConcept implements AxConceptGetter<AxContextAlbum> { private static final long serialVersionUID = -4844259809024470975L; @@ -84,8 +83,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< // @formatter:on /** - * The Default Constructor creates a {@link AxContextAlbums} object with a null artifact key and - * creates an empty context album map. + * The Default Constructor creates a {@link AxContextAlbums} object with a null artifact key and creates an empty + * context album map. */ public AxContextAlbums() { this(new AxArtifactKey()); @@ -93,7 +92,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /** * Copy constructor - * + * * @param copyConcept the concept to copy from */ public AxContextAlbums(final AxContextAlbums copyConcept) { @@ -101,8 +100,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< } /** - * The Key Constructor creates a {@link AxContextAlbums} object with the given artifact key and - * creates an empty context album map. + * The Key Constructor creates a {@link AxContextAlbums} object with the given artifact key and creates an empty + * context album map. * * @param key the key of the context album container */ @@ -127,10 +126,9 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< } /** - * When a model is unmarshalled from disk or from the database, the context album map is - * returned as a raw hash map. This method is called by JAXB after unmarshaling and is used to - * convert the hash map to a {@link NavigableMap} so that it will work with the - * {@link AxConceptGetter} interface. + * When a model is unmarshalled from disk or from the database, the context album map is returned as a raw hash map. + * This method is called by JAXB after unmarshaling and is used to convert the hash map to a {@link NavigableMap} so + * that it will work with the {@link AxConceptGetter} interface. * * @param u the unmarshaler that is unmarshaling the model * @param parent the parent object of this object in the unmarshaler @@ -146,7 +144,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKey() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() */ @Override public AxArtifactKey getKey() { @@ -156,7 +154,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKeys() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() */ @Override public List<AxKey> getKeys() { @@ -202,7 +200,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#clean() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() */ @Override public void clean() { @@ -216,7 +214,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#toString() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() */ @Override public String toString() { @@ -236,7 +234,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#validate(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. * basicmodel.concepts.AxValidationResult) */ @Override @@ -281,7 +279,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#copyTo(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. * basicmodel.concepts.AxConcept) */ @Override @@ -306,7 +304,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#hashCode() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() */ @Override public int hashCode() { @@ -320,7 +318,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) */ @Override public boolean equals(final Object obj) { @@ -373,7 +371,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConceptGetter#get(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.model. * basicmodel.concepts.AxArtifactKey) */ @Override @@ -384,7 +382,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) */ @Override public AxContextAlbum get(final String conceptKeyName) { @@ -394,8 +392,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, - * java.lang.String) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) */ @Override public AxContextAlbum get(final String conceptKeyName, final String conceptKeyVersion) { @@ -406,7 +403,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) */ @Override public Set<AxContextAlbum> getAll(final String conceptKeyName) { @@ -416,8 +413,7 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, - * java.lang.String) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) */ @Override public Set<AxContextAlbum> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextModel.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java index dcd381872..2aa6fc70a 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextModel.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java @@ -5,20 +5,20 @@ * 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.apex.model.contextmodel.concepts; +package org.onap.policy.apex.model.contextmodel.concepts; import java.util.List; @@ -34,32 +34,31 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.onap.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.apex.model.basicmodel.concepts.AxConcept; -import org.onap.apex.model.basicmodel.concepts.AxKey; -import org.onap.apex.model.basicmodel.concepts.AxKeyInformation; -import org.onap.apex.model.basicmodel.concepts.AxModel; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult; -import org.onap.apex.model.basicmodel.service.ModelService; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxConcept; +import org.onap.policy.apex.model.basicmodel.concepts.AxKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation; +import org.onap.policy.apex.model.basicmodel.concepts.AxModel; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; +import org.onap.policy.apex.model.basicmodel.service.ModelService; import org.onap.policy.apex.model.utilities.Assertions; /** - * A container class for an Apex context model. This class is a container class that allows an Apex - * model to be constructed that just contains context and the key information for that context. The - * model contains schema definitions and the definitions of context albums that use those schemas. - * In the case where Apex context is being used without policy or independent of policy, an Apex - * context model is sufficient to get Apex context working. + * A container class for an Apex context model. This class is a container class that allows an Apex model to be + * constructed that just contains context and the key information for that context. The model contains schema + * definitions and the definitions of context albums that use those schemas. In the case where Apex context is being + * used without policy or independent of policy, an Apex context model is sufficient to get Apex context working. * <p> - * Validation runs {@link AxModel} validation on the model. In addition, the - * {@link AxContextSchemas} and {@link AxContextAlbums} validation is run on the context schemas and - * albums in the model. + * Validation runs {@link AxModel} validation on the model. In addition, the {@link AxContextSchemas} and + * {@link AxContextAlbums} validation is run on the context schemas and albums in the model. */ @Entity @Table(name = "AxContextModel") -@XmlRootElement(name = "apexContextModel", namespace = "http://www.ericsson.com/apex") +@XmlRootElement(name = "apexContextModel", namespace = "http://www.onap.org/policy/apex-pdp") @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AxContextModel", namespace = "http://www.ericsson.com/apex", propOrder = {"schemas", "albums"}) +@XmlType(name = "AxContextModel", namespace = "http://www.onap.org/policy/apex-pdp", + propOrder = { "schemas", "albums" }) public class AxContextModel extends AxModel { private static final long serialVersionUID = 8800599637708309945L; @@ -83,16 +82,16 @@ public class AxContextModel extends AxModel { // @formatter:on /** - * The Default Constructor creates a {@link AxContextModel} object with a null artifact key and - * creates an empty context model. + * The Default Constructor creates a {@link AxContextModel} object with a null artifact key and creates an empty + * context model. */ public AxContextModel() { this(new AxArtifactKey()); } /** - * The Key Constructor creates a {@link AxContextModel} object with the given artifact key and - * creates an empty context model. + * The Key Constructor creates a {@link AxContextModel} object with the given artifact key and creates an empty + * context model. * * @param key the key of the context model */ @@ -104,7 +103,7 @@ public class AxContextModel extends AxModel { /** * Copy constructor - * + * * @param copyConcept the concept to copy from */ public AxContextModel(final AxContextModel copyConcept) { @@ -112,8 +111,8 @@ public class AxContextModel extends AxModel { } /** - * Constructor that initiates a {@link AxContextModel} with schemas and keys for those schemas. - * An empty {@link AxContextAlbums} container is created. + * Constructor that initiates a {@link AxContextModel} with schemas and keys for those schemas. An empty + * {@link AxContextAlbums} container is created. * * @param key the key of the context model * @param schemas the context schema definitions @@ -145,7 +144,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#register() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#register() */ @Override public void register() { @@ -157,7 +156,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#getKeys() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#getKeys() */ @Override public List<AxKey> getKeys() { @@ -210,7 +209,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#validate(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#validate(org.onap.policy.apex.model. * basicmodel.concepts.AxValidationResult) */ @Override @@ -225,7 +224,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#clean() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#clean() */ @Override public void clean() { @@ -237,7 +236,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#toString() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#toString() */ @Override public String toString() { @@ -256,7 +255,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#copyTo(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. * basicmodel.concepts.AxConcept) */ @Override @@ -277,7 +276,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#hashCode() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#hashCode() */ @Override public int hashCode() { @@ -292,7 +291,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) */ @Override public boolean equals(final Object obj) { @@ -320,7 +319,7 @@ public class AxContextModel extends AxModel { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxModel#compareTo(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#compareTo(org.onap.policy.apex.model. * basicmodel.concepts.AxConcept) */ @Override diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextSchema.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java index 852e3f552..3abcebee9 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextSchema.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java @@ -5,20 +5,20 @@ * 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.apex.model.contextmodel.concepts; +package org.onap.policy.apex.model.contextmodel.concepts; import java.util.List; @@ -34,42 +34,40 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.onap.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.apex.model.basicmodel.concepts.AxConcept; -import org.onap.apex.model.basicmodel.concepts.AxKey; -import org.onap.apex.model.basicmodel.concepts.AxValidationMessage; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; -import org.onap.apex.model.basicmodel.dao.converters.CDATAConditioner; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxConcept; +import org.onap.policy.apex.model.basicmodel.concepts.AxKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationMessage; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; +import org.onap.policy.apex.model.basicmodel.dao.converters.CDATAConditioner; import org.onap.policy.apex.model.utilities.Assertions; /** - * This class holds a data schema definition in Apex. A data schema describes the structure of a - * single atom of data handled by Apex. This atom of data can be a primitive type such as an integer - * or a string, or it can be a more complex data type such as a Java object or an object described - * using a data definition language such as Avro. The schema flavour defines the type of schema - * being defined and the schema itself defines the schema. The schema flavour is used by Apex to - * look up and load a plugin class that understands and interprets the schema definition and can + * This class holds a data schema definition in Apex. A data schema describes the structure of a single atom of data + * handled by Apex. This atom of data can be a primitive type such as an integer or a string, or it can be a more + * complex data type such as a Java object or an object described using a data definition language such as Avro. The + * schema flavour defines the type of schema being defined and the schema itself defines the schema. The schema flavour + * is used by Apex to look up and load a plugin class that understands and interprets the schema definition and can * create instances of classes for the schema. * <p> - * An {@link AxContextSchema} is used to define each parameter in Apex events, the messages that - * enter, exit, and are passed internally in Apex. In addition, an Apex {@link AxContextAlbum} - * instances hold a map of {@link AxContextSchema} instances to represent the context being managed - * as an {@link AxContextAlbum}. For example, the state of all cells in a mobile network might be - * represented as an {@link AxContextAlbum} with its {@link AxContextSchema} being defined as @code - * cell} objects. + * An {@link AxContextSchema} is used to define each parameter in Apex events, the messages that enter, exit, and are + * passed internally in Apex. In addition, an Apex {@link AxContextAlbum} instances hold a map of + * {@link AxContextSchema} instances to represent the context being managed as an {@link AxContextAlbum}. For example, + * the state of all cells in a mobile network might be represented as an {@link AxContextAlbum} with its + * {@link AxContextSchema} being defined as @code cell} objects. * <p> - * Validation checks that the schema key is not null. It also checks that the schema flavour is - * defined and matches the regular expression {@link SCHEMA_FLAVOUR_REGEXP}. Finally, validation - * checks that the defined schema is not a blank or empty string. + * Validation checks that the schema key is not null. It also checks that the schema flavour is defined and matches the + * regular expression {@link SCHEMA_FLAVOUR_REGEXP}. Finally, validation checks that the defined schema is not a blank + * or empty string. */ @Entity @Table(name = "AxContextSchema") @XmlAccessorType(XmlAccessType.FIELD) -@XmlRootElement(name = "apexContextSchema", namespace = "http://www.ericsson.com/apex") -@XmlType(name = "AxContextSchema", namespace = "http://www.ericsson.com/apex", - propOrder = {"key", "schemaFlavour", "schemaDefinition"}) +@XmlRootElement(name = "apexContextSchema", namespace = "http://www.onap.org/policy/apex-pdp") +@XmlType(name = "AxContextSchema", namespace = "http://www.onap.org/policy/apex-pdp", + propOrder = { "key", "schemaFlavour", "schemaDefinition" }) public class AxContextSchema extends AxConcept { private static final String SCHEMA_FLAVOUR = "schemaFlavour"; @@ -101,9 +99,8 @@ public class AxContextSchema extends AxConcept { private String schemaDefinition; /** - * The default constructor creates a context schema with a null artifact key. The flavour of the - * context album is set as {@link SCHEMA_FLAVOUR_UNDEFINED} and the schema itself is defined as - * an empty string. + * The default constructor creates a context schema with a null artifact key. The flavour of the context album is + * set as {@link SCHEMA_FLAVOUR_UNDEFINED} and the schema itself is defined as an empty string. */ public AxContextSchema() { this(new AxArtifactKey()); @@ -112,7 +109,7 @@ public class AxContextSchema extends AxConcept { /** * Copy constructor - * + * * @param copyConcept the concept to copy from */ public AxContextSchema(final AxContextSchema copyConcept) { @@ -120,9 +117,8 @@ public class AxContextSchema extends AxConcept { } /** - * The key constructor creates a context schema with the given artifact key. The flavour of the - * context album is set as {@link SCHEMA_FLAVOUR_UNDEFINED} and the schema itself is defined as - * an empty string. + * The key constructor creates a context schema with the given artifact key. The flavour of the context album is set + * as {@link SCHEMA_FLAVOUR_UNDEFINED} and the schema itself is defined as an empty string. * * @param key the key */ @@ -151,7 +147,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKey() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() */ @Override public AxArtifactKey getKey() { @@ -161,7 +157,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKeys() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() */ @Override public List<AxKey> getKeys() { @@ -218,7 +214,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#validate(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. * basicmodel.concepts.AxValidationResult) */ @Override @@ -256,7 +252,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#clean() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() */ @Override public void clean() { @@ -268,7 +264,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#toString() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() */ @Override public String toString() { @@ -288,7 +284,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#copyTo(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. * basicmodel.concepts.AxConcept) */ @Override @@ -309,7 +305,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#hashCode() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() */ @Override public int hashCode() { @@ -324,7 +320,7 @@ public class AxContextSchema extends AxConcept { /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) */ @Override public boolean equals(final Object obj) { diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextSchemas.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java index b4a7e4ada..df94a87a9 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/AxContextSchemas.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java @@ -5,20 +5,20 @@ * 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.apex.model.contextmodel.concepts; +package org.onap.policy.apex.model.contextmodel.concepts; import java.util.List; import java.util.Map; @@ -40,33 +40,31 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.onap.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.apex.model.basicmodel.concepts.AxConcept; -import org.onap.apex.model.basicmodel.concepts.AxConceptGetter; -import org.onap.apex.model.basicmodel.concepts.AxConceptGetterImpl; -import org.onap.apex.model.basicmodel.concepts.AxKey; -import org.onap.apex.model.basicmodel.concepts.AxValidationMessage; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult; -import org.onap.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxConcept; +import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter; +import org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetterImpl; +import org.onap.policy.apex.model.basicmodel.concepts.AxKey; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationMessage; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; +import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult; import org.onap.policy.apex.model.utilities.Assertions; /** - * This class is a context schema container and holds a map of the context schemas for an entire - * Apex model. All Apex models that use context schemas must have an {@link AxContextSchemas} field. - * The {@link AxContextSchemas} class implements the helper methods of the {@link AxConceptGetter} - * interface to allow {@link AxContextSchema} instances to be retrieved by calling methods directly - * on this class without referencing the contained map. + * This class is a context schema container and holds a map of the context schemas for an entire Apex model. All Apex + * models that use context schemas must have an {@link AxContextSchemas} field. The {@link AxContextSchemas} class + * implements the helper methods of the {@link AxConceptGetter} interface to allow {@link AxContextSchema} instances to + * be retrieved by calling methods directly on this class without referencing the contained map. * <p> - * Validation checks that the container key is not null. An error is issued if no context schemas - * are defined in the container. Each context schema entry is checked to ensure that its key and - * value are not null and that the key matches the key in the map value. Each context schema entry - * is then validated individually. + * Validation checks that the container key is not null. An error is issued if no context schemas are defined in the + * container. Each context schema entry is checked to ensure that its key and value are not null and that the key + * matches the key in the map value. Each context schema entry is then validated individually. */ @Entity @Table(name = "AxContextSchemas") @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AxContextSchemas", namespace = "http://www.ericsson.com/apex", propOrder = {"key", "schemas"}) +@XmlType(name = "AxContextSchemas", namespace = "http://www.onap.org/policy/apex-pdp", propOrder = { "key", "schemas" }) public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxContextSchema> { private static final long serialVersionUID = -3203734282886453582L; @@ -87,8 +85,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon // @formatter:on /** - * The Default Constructor creates a {@link AxContextSchemas} object with a null artifact key - * and creates an empty context schemas map. + * The Default Constructor creates a {@link AxContextSchemas} object with a null artifact key and creates an empty + * context schemas map. */ public AxContextSchemas() { this(new AxArtifactKey()); @@ -96,7 +94,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /** * Copy constructor - * + * * @param copyConcept the concept to copy from */ public AxContextSchemas(final AxContextSchemas copyConcept) { @@ -104,8 +102,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon } /** - * The Key Constructor creates a {@link AxContextSchemas} object with the given artifact key and - * creates an empty context schemas map. + * The Key Constructor creates a {@link AxContextSchemas} object with the given artifact key and creates an empty + * context schemas map. * * @param key the key of the context album container */ @@ -130,10 +128,9 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon } /** - * When a model is unmarshalled from disk or from the database, the context schema map is - * returned as a raw hash map. This method is called by JAXB after unmarshaling and is used to - * convert the hash map to a {@link NavigableMap} so that it will work with the - * {@link AxConceptGetter} interface. + * When a model is unmarshalled from disk or from the database, the context schema map is returned as a raw hash + * map. This method is called by JAXB after unmarshaling and is used to convert the hash map to a + * {@link NavigableMap} so that it will work with the {@link AxConceptGetter} interface. * * @param u the unmarshaler that is unmarshaling the model * @param parent the parent object of this object in the unmarshaler @@ -149,7 +146,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKey() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() */ @Override public AxArtifactKey getKey() { @@ -159,7 +156,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#getKeys() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() */ @Override public List<AxKey> getKeys() { @@ -203,7 +200,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#validate(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. * basicmodel.concepts.AxValidationResult) */ @Override @@ -246,7 +243,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#clean() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() */ @Override public void clean() { @@ -260,7 +257,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#toString() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() */ @Override public String toString() { @@ -278,7 +275,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#copyTo(com.ericsson.apex.model. + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. * basicmodel.concepts.AxConcept) */ @Override @@ -304,7 +301,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#hashCode() + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() */ @Override public int hashCode() { @@ -318,7 +315,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) */ @Override public boolean equals(final Object obj) { @@ -370,7 +367,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.core.basicmodel.concepts.AxConceptGetter#get(com.ericsson.apex.core. + * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.core. * basicmodel.concepts.AxArtifactKey) */ @Override @@ -381,7 +378,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String) */ @Override public AxContextSchema get(final String conceptKeyName) { @@ -391,8 +388,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String, - * java.lang.String) + * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) */ @Override public AxContextSchema get(final String conceptKeyName, final String conceptKeyVersion) { @@ -403,7 +399,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) */ @Override public Set<AxContextSchema> getAll(final String conceptKeyName) { @@ -413,8 +409,7 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon /* * (non-Javadoc) * - * @see com.ericsson.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, - * java.lang.String) + * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) */ @Override public Set<AxContextSchema> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/package-info.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java index f89f2f803..a7aa3a5ad 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/concepts/package-info.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java @@ -5,23 +5,24 @@ * 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========================================================= */ /** - * Contains the concepts required to manage context in APEX. It defines the main APEX concepts of - * Context Schemas and Context Albums. - * + * Contains the concepts required to manage context in APEX. It defines the main APEX concepts of Context Schemas and + * Context Albums. + * * @author Liam Fallon (liam.fallon@ericsson.com) */ -package org.onap.apex.model.contextmodel.concepts; + +package org.onap.policy.apex.model.contextmodel.concepts; diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/handling/ContextComparer.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java index 8d654be74..7a5ebfd22 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/handling/ContextComparer.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.apex.model.contextmodel.handling; +package org.onap.policy.apex.model.contextmodel.handling; -import org.onap.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.apex.model.contextmodel.concepts.AxContextAlbum; -import org.onap.apex.model.contextmodel.concepts.AxContextAlbums; -import org.onap.apex.model.contextmodel.concepts.AxContextSchema; -import org.onap.apex.model.contextmodel.concepts.AxContextSchemas; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum; +import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums; +import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema; +import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas; import org.onap.policy.apex.model.utilities.comparison.KeyedMapComparer; import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference; diff --git a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/handling/package-info.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java index bfc44f7e0..ec1fa893f 100644 --- a/model/context-model/src/main/java/org/onap/apex/model/contextmodel/handling/package-info.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java @@ -24,4 +24,4 @@ * * @author Liam Fallon (liam.fallon@ericsson.com) */ -package org.onap.apex.model.contextmodel.handling; +package org.onap.policy.apex.model.contextmodel.handling; |