aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openecomp/datarouter
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openecomp/datarouter')
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/AaiEventEntity.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/AggregationEntity.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/DocumentStoreDataEntity.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/OxmEntityDescriptor.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/PolicyResponse.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/SuggestionSearchEntity.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/TopographicalEntity.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/entity/UebEventHeader.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/exception/DataRouterError.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/service/EchoService.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/FileWatcher.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/NodeUtils.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/Version.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java10
35 files changed, 140 insertions, 210 deletions
diff --git a/src/main/java/org/openecomp/datarouter/entity/AaiEventEntity.java b/src/main/java/org/openecomp/datarouter/entity/AaiEventEntity.java
index 5f44fe1..437db06 100644
--- a/src/main/java/org/openecomp/datarouter/entity/AaiEventEntity.java
+++ b/src/main/java/org/openecomp/datarouter/entity/AaiEventEntity.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
/*
* ============LICENSE_START=======================================================
diff --git a/src/main/java/org/openecomp/datarouter/entity/AggregationEntity.java b/src/main/java/org/openecomp/datarouter/entity/AggregationEntity.java
index 4830d67..57a5f5c 100644
--- a/src/main/java/org/openecomp/datarouter/entity/AggregationEntity.java
+++ b/src/main/java/org/openecomp/datarouter/entity/AggregationEntity.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.entity;
diff --git a/src/main/java/org/openecomp/datarouter/entity/DocumentStoreDataEntity.java b/src/main/java/org/openecomp/datarouter/entity/DocumentStoreDataEntity.java
index 61df316..d62ab91 100644
--- a/src/main/java/org/openecomp/datarouter/entity/DocumentStoreDataEntity.java
+++ b/src/main/java/org/openecomp/datarouter/entity/DocumentStoreDataEntity.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.entity;
diff --git a/src/main/java/org/openecomp/datarouter/entity/OxmEntityDescriptor.java b/src/main/java/org/openecomp/datarouter/entity/OxmEntityDescriptor.java
index 9f486e4..cbd2b96 100644
--- a/src/main/java/org/openecomp/datarouter/entity/OxmEntityDescriptor.java
+++ b/src/main/java/org/openecomp/datarouter/entity/OxmEntityDescriptor.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.entity;
diff --git a/src/main/java/org/openecomp/datarouter/entity/PolicyResponse.java b/src/main/java/org/openecomp/datarouter/entity/PolicyResponse.java
index fd577fa..558f701 100644
--- a/src/main/java/org/openecomp/datarouter/entity/PolicyResponse.java
+++ b/src/main/java/org/openecomp/datarouter/entity/PolicyResponse.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.entity;
diff --git a/src/main/java/org/openecomp/datarouter/entity/SuggestionSearchEntity.java b/src/main/java/org/openecomp/datarouter/entity/SuggestionSearchEntity.java
index 82e2fa9..59f7f59 100644
--- a/src/main/java/org/openecomp/datarouter/entity/SuggestionSearchEntity.java
+++ b/src/main/java/org/openecomp/datarouter/entity/SuggestionSearchEntity.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.entity;
diff --git a/src/main/java/org/openecomp/datarouter/entity/TopographicalEntity.java b/src/main/java/org/openecomp/datarouter/entity/TopographicalEntity.java
index 79cdfcd..7e4aa3b 100644
--- a/src/main/java/org/openecomp/datarouter/entity/TopographicalEntity.java
+++ b/src/main/java/org/openecomp/datarouter/entity/TopographicalEntity.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.entity;
diff --git a/src/main/java/org/openecomp/datarouter/entity/UebEventHeader.java b/src/main/java/org/openecomp/datarouter/entity/UebEventHeader.java
index 5eab97f..5843545 100644
--- a/src/main/java/org/openecomp/datarouter/entity/UebEventHeader.java
+++ b/src/main/java/org/openecomp/datarouter/entity/UebEventHeader.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.entity;
diff --git a/src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java b/src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java
index 0cd0381..cc56d05 100644
--- a/src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java
+++ b/src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.exception;
diff --git a/src/main/java/org/openecomp/datarouter/exception/DataRouterError.java b/src/main/java/org/openecomp/datarouter/exception/DataRouterError.java
index 4920591..a96d2db 100644
--- a/src/main/java/org/openecomp/datarouter/exception/DataRouterError.java
+++ b/src/main/java/org/openecomp/datarouter/exception/DataRouterError.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.exception;
diff --git a/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java b/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java
index 6206b63..701c74e 100644
--- a/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java
+++ b/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.logging;
diff --git a/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java b/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java
index 09be3a0..d95903d 100644
--- a/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java
+++ b/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.logging;
diff --git a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
index 4938bdd..1cb8a67 100644
--- a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
+++ b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.policy;
diff --git a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java
index 4728f82..4bfcd5c 100644
--- a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java
+++ b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.policy;
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java
index a516de0..0a4f1d7 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java
+++ b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.search.filters.config;
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java
index ac22d7b..bbd39f0 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java
+++ b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.search.filters.config;
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java
index dff4a30..49fb846 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java
+++ b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.search.filters.config;
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java
index e674495..dcd8de0 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java
+++ b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.search.filters.config;
diff --git a/src/main/java/org/openecomp/datarouter/service/EchoService.java b/src/main/java/org/openecomp/datarouter/service/EchoService.java
index e7f6368..09dbd0e 100644
--- a/src/main/java/org/openecomp/datarouter/service/EchoService.java
+++ b/src/main/java/org/openecomp/datarouter/service/EchoService.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.service;
diff --git a/src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java b/src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java
index d5388d6..856e38a 100644
--- a/src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java
+++ b/src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java b/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
index 48f3c27..f55d2e7 100644
--- a/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
+++ b/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java b/src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java
index fff16f2..b18b794 100644
--- a/src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java
+++ b/src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java b/src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java
index 7e18363..21e36a2 100644
--- a/src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java
+++ b/src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java b/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
index c9e1746..503a069 100644
--- a/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
+++ b/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java b/src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java
index 9fcef6f..5c027d3 100644
--- a/src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java
+++ b/src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/FileWatcher.java b/src/main/java/org/openecomp/datarouter/util/FileWatcher.java
index e382c21..5b04310 100644
--- a/src/main/java/org/openecomp/datarouter/util/FileWatcher.java
+++ b/src/main/java/org/openecomp/datarouter/util/FileWatcher.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/NodeUtils.java b/src/main/java/org/openecomp/datarouter/util/NodeUtils.java
index 6b2044d..d98b2e6 100644
--- a/src/main/java/org/openecomp/datarouter/util/NodeUtils.java
+++ b/src/main/java/org/openecomp/datarouter/util/NodeUtils.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java b/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java
index 2919ba2..af78a09 100644
--- a/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java
+++ b/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java b/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
index f2ff7ac..aedca66 100644
--- a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
+++ b/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
index 3d27425..758f584 100644
--- a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
+++ b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java b/src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java
index 4954a92..fbf7c5b 100644
--- a/src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java
+++ b/src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/Version.java b/src/main/java/org/openecomp/datarouter/util/Version.java
index a0b3e5f..5d74254 100644
--- a/src/main/java/org/openecomp/datarouter/util/Version.java
+++ b/src/main/java/org/openecomp/datarouter/util/Version.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java b/src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java
index 46c4a76..f6af56c 100644
--- a/src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java
+++ b/src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util;
diff --git a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java b/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
index 33874a8..d8d150c 100644
--- a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
+++ b/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util.client;
diff --git a/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java b/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
index b1af73c..e22f144 100644
--- a/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
+++ b/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
@@ -1,16 +1,15 @@
/**
* ============LICENSE_START=======================================================
- * DataRouter
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* 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
+ * 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,
@@ -19,8 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.openecomp.datarouter.util.client;