diff options
Diffstat (limited to 'aai-resources/src/test/java')
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/AAISetup.java (renamed from aai-resources/src/test/java/org/openecomp/aai/AAISetup.java) | 25 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSInInterceptorTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptorTest.java) | 19 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/interceptors/PostAaiAjscInterceptorTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/interceptors/PostAaiAjscInterceptorTest.java) | 19 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/interceptors/PreAaiAjscInterceptorTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/interceptors/PreAaiAjscInterceptorTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/migration/VertexMergeTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/migration/VertexMergeTest.java) | 41 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/BulkAddConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/BulkAddConsumerTest.java) | 25 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/BulkProcessConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/BulkProcessConsumerTest.java) | 25 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/ExampleConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/ExampleConsumerTest.java) | 25 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/ExceptionHandlerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/ExceptionHandlerTest.java) | 19 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/LegacyMoxyConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/LegacyMoxyConsumerTest.java) | 27 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/URLFromVertexIdConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/URLFromVertexIdConsumerTest.java) | 27 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/VertexIdConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/VertexIdConsumerTest.java) | 27 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/retired/RetiredConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/retired/RetiredConsumerTest.java) | 19 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/retired/V3ThroughV7ConsumerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/retired/V3ThroughV7ConsumerTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/retired/V7V8ModelsTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8ModelsTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/retired/V7V8NamedQueriesTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8NamedQueriesTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/tools/ModelVersionTransformerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/tools/ModelVersionTransformerTest.java) | 23 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/util/EchoResponseTest.java) | 19 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/util/LogFormatToolsTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/util/LogFormatToolsTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/util/ValidateEncodingTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/rest/util/ValidateEncodingTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/schema/db/AuditOXMTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/schema/db/AuditOXMTest.java) | 29 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/schema/db/ManageSchemaTest.java) | 23 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java (renamed from aai-resources/src/test/java/org/openecomp/aai/serialization/queryformats/QueryFormatTestHelper.java) | 27 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/transforms/JoltTestUtil.java (renamed from aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/transforms/LowerHyphenToLowerCamelConverterTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/transforms/LowerHyphenToLowerCamelConverterTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/transforms/MapTraverserTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/transforms/MapTraverserTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/AAIAppServletContextListenerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/AAIAppServletContextListenerTest.java) | 21 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/AAICSVWriterTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/AAICSVWriterTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/AAIRSyncUtilityTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/AAIRSyncUtilityTest.java) | 19 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/DataConversionHelperTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/DataConversionHelperTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/DbTestConfig.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/DbTestConfig.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/DbTestFileWatcher.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/DbTestFileWatcher.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/DbTestGetFileTime.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/DbTestGetFileTime.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/DbTestProcessBuilder.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/DbTestProcessBuilder.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/HbaseSaltPrefixerTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/HbaseSaltPrefixerTest.java) | 17 | ||||
-rw-r--r-- | aai-resources/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java (renamed from aai-resources/src/test/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtilTest.java) | 17 |
36 files changed, 392 insertions, 356 deletions
diff --git a/aai-resources/src/test/java/org/openecomp/aai/AAISetup.java b/aai-resources/src/test/java/org/onap/aai/AAISetup.java index e210f3d..65048eb 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/AAISetup.java +++ b/aai-resources/src/test/java/org/onap/aai/AAISetup.java @@ -1,31 +1,32 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai; +package org.onap.aai; import org.apache.commons.io.IOUtils; import org.junit.BeforeClass; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.serialization.queryformats.QueryFormatTestHelper; +import org.onap.aai.util.AAIConstants; import java.io.IOException; import java.io.InputStream; diff --git a/aai-resources/src/test/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptorTest.java b/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSInInterceptorTest.java index 14c6fb4..3b1dac2 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptorTest.java +++ b/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSInInterceptorTest.java @@ -1,31 +1,32 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.interceptors; +package org.onap.aai.interceptors; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.ExchangeImpl; import org.apache.cxf.message.Message; import org.junit.Before; import org.junit.Test; -import org.openecomp.aai.AAISetup; +import org.onap.aai.AAISetup; import java.io.IOException; import java.io.InputStream; diff --git a/aai-resources/src/test/java/org/openecomp/aai/interceptors/PostAaiAjscInterceptorTest.java b/aai-resources/src/test/java/org/onap/aai/interceptors/PostAaiAjscInterceptorTest.java index 17f5c44..2842e26 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/interceptors/PostAaiAjscInterceptorTest.java +++ b/aai-resources/src/test/java/org/onap/aai/interceptors/PostAaiAjscInterceptorTest.java @@ -1,29 +1,30 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.interceptors; +package org.onap.aai.interceptors; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.logging.LoggingContext; +import org.onap.aai.logging.LoggingContext; import javax.servlet.http.HttpServletRequest; diff --git a/aai-resources/src/test/java/org/openecomp/aai/interceptors/PreAaiAjscInterceptorTest.java b/aai-resources/src/test/java/org/onap/aai/interceptors/PreAaiAjscInterceptorTest.java index 3379182..49b5664 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/interceptors/PreAaiAjscInterceptorTest.java +++ b/aai-resources/src/test/java/org/onap/aai/interceptors/PreAaiAjscInterceptorTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.interceptors; +package org.onap.aai.interceptors; import org.junit.Before; import org.junit.Test; diff --git a/aai-resources/src/test/java/org/openecomp/aai/migration/VertexMergeTest.java b/aai-resources/src/test/java/org/onap/aai/migration/VertexMergeTest.java index 71e3827..9e68965 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/migration/VertexMergeTest.java +++ b/aai-resources/src/test/java/org/onap/aai/migration/VertexMergeTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.migration; +package org.onap.aai.migration; import com.thinkaurelius.titan.core.Cardinality; import com.thinkaurelius.titan.core.TitanFactory; @@ -28,18 +29,18 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.*; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.dbmap.DBConnectionType; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.db.EdgeRules; -import org.openecomp.aai.serialization.engines.QueryStyle; -import org.openecomp.aai.serialization.engines.TitanDBEngine; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.AAISetup; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.dbmap.DBConnectionType; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.introspection.ModelType; +import org.onap.aai.introspection.Version; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.db.EdgeRules; +import org.onap.aai.serialization.engines.QueryStyle; +import org.onap.aai.serialization.engines.TitanDBEngine; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import java.io.UnsupportedEncodingException; import java.util.*; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/BulkAddConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/BulkAddConsumerTest.java index 1368d73..28ded9d 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/BulkAddConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/BulkAddConsumerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest; +package org.onap.aai.rest; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -27,10 +28,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.AAISetup; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.introspection.Version; import javax.ws.rs.core.*; import java.io.IOException; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/BulkProcessConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessConsumerTest.java index 6d2bea2..99bccc7 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/BulkProcessConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/BulkProcessConsumerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest; +package org.onap.aai.rest; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -27,10 +28,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.AAISetup; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.introspection.Version; import javax.ws.rs.core.*; import java.io.IOException; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/ExampleConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ExampleConsumerTest.java index f67e59d..30a3832 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/ExampleConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/ExampleConsumerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest; +package org.onap.aai.rest; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -26,10 +27,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.AAISetup; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.introspection.Version; import javax.ws.rs.core.*; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/ExceptionHandlerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ExceptionHandlerTest.java index 38a243a..d6714ba 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/ExceptionHandlerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/ExceptionHandlerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest; +package org.onap.aai.rest; import com.fasterxml.jackson.core.JsonLocation; import com.fasterxml.jackson.core.JsonParseException; @@ -29,7 +30,7 @@ import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openecomp.aai.AAISetup; +import org.onap.aai.AAISetup; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/LegacyMoxyConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/LegacyMoxyConsumerTest.java index 8128b42..00d2496 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/LegacyMoxyConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/LegacyMoxyConsumerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest; +package org.onap.aai.rest; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -29,11 +30,11 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.AAISetup; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.introspection.Version; import org.skyscreamer.jsonassert.JSONAssert; import javax.ws.rs.core.*; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/URLFromVertexIdConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/URLFromVertexIdConsumerTest.java index caad6a2..c2a6c4a 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/URLFromVertexIdConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/URLFromVertexIdConsumerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest; +package org.onap.aai.rest; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -27,11 +28,11 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.AAISetup; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.introspection.Version; import javax.ws.rs.core.*; import java.io.IOException; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/VertexIdConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/VertexIdConsumerTest.java index 284f4c1..fa80805 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/VertexIdConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/VertexIdConsumerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest; +package org.onap.aai.rest; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -27,11 +28,11 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.AAISetup; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.introspection.Version; import javax.ws.rs.core.*; import java.io.IOException; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/RetiredConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/retired/RetiredConsumerTest.java index 2b0bc6e..66846b6 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/RetiredConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/retired/RetiredConsumerTest.java @@ -1,31 +1,32 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.retired; +package org.onap.aai.rest.retired; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.introspection.Version; import javax.ws.rs.core.*; import java.util.*; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V3ThroughV7ConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/retired/V3ThroughV7ConsumerTest.java index ceda6d1..b605bad 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V3ThroughV7ConsumerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/retired/V3ThroughV7ConsumerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.retired; +package org.onap.aai.rest.retired; public class V3ThroughV7ConsumerTest extends RetiredConsumerTest { diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8ModelsTest.java b/aai-resources/src/test/java/org/onap/aai/rest/retired/V7V8ModelsTest.java index ce4ed70..be5ed82 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8ModelsTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/retired/V7V8ModelsTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.retired; +package org.onap.aai.rest.retired; public class V7V8ModelsTest extends RetiredConsumerTest { diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8NamedQueriesTest.java b/aai-resources/src/test/java/org/onap/aai/rest/retired/V7V8NamedQueriesTest.java index a2f87e5..f9a6e8c 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8NamedQueriesTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/retired/V7V8NamedQueriesTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.retired; +package org.onap.aai.rest.retired; public class V7V8NamedQueriesTest extends RetiredConsumerTest { diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/tools/ModelVersionTransformerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/tools/ModelVersionTransformerTest.java index a76a245..911fc2d 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/tools/ModelVersionTransformerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/tools/ModelVersionTransformerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.tools; +package org.onap.aai.rest.tools; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -26,9 +27,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.introspection.ModelInjestor; +import org.onap.aai.AAISetup; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.introspection.ModelInjestor; import org.skyscreamer.jsonassert.JSONAssert; import javax.ws.rs.core.*; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/util/EchoResponseTest.java b/aai-resources/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java index 54f6127..5f62342 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/util/EchoResponseTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java @@ -1,31 +1,32 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.util; +package org.onap.aai.rest.util; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.aai.AAISetup; +import org.onap.aai.AAISetup; import javax.ws.rs.core.*; import java.util.*; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/util/LogFormatToolsTest.java b/aai-resources/src/test/java/org/onap/aai/rest/util/LogFormatToolsTest.java index 6b0d1fb..c4cc211 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/util/LogFormatToolsTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/util/LogFormatToolsTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.util; +package org.onap.aai.rest.util; import org.junit.Test; diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/util/ValidateEncodingTest.java b/aai-resources/src/test/java/org/onap/aai/rest/util/ValidateEncodingTest.java index 220d7d3..9ce81f4 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/rest/util/ValidateEncodingTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/util/ValidateEncodingTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.rest.util; +package org.onap.aai.rest.util; import org.junit.Test; import org.mockito.Mockito; diff --git a/aai-resources/src/test/java/org/openecomp/aai/schema/db/AuditOXMTest.java b/aai-resources/src/test/java/org/onap/aai/schema/db/AuditOXMTest.java index f76c151..d3c7302 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/schema/db/AuditOXMTest.java +++ b/aai-resources/src/test/java/org/onap/aai/schema/db/AuditOXMTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.schema.db; +package org.onap.aai.schema.db; import com.thinkaurelius.titan.core.TitanFactory; import com.thinkaurelius.titan.core.TitanGraph; @@ -27,12 +28,12 @@ import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.db.schema.AuditDoc; -import org.openecomp.aai.db.schema.AuditOXM; -import org.openecomp.aai.db.schema.Auditor; -import org.openecomp.aai.db.schema.AuditorFactory; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.AAISetup; +import org.onap.aai.db.schema.AuditDoc; +import org.onap.aai.db.schema.AuditOXM; +import org.onap.aai.db.schema.Auditor; +import org.onap.aai.db.schema.AuditorFactory; +import org.onap.aai.introspection.Version; import java.io.IOException; diff --git a/aai-resources/src/test/java/org/openecomp/aai/schema/db/ManageSchemaTest.java b/aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java index c11358f..4eeb172 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/schema/db/ManageSchemaTest.java +++ b/aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.schema.db; +package org.onap.aai.schema.db; import com.thinkaurelius.titan.core.TitanFactory; import com.thinkaurelius.titan.core.TitanGraph; @@ -29,9 +30,9 @@ import org.codehaus.jackson.map.ObjectMapper; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.aai.AAISetup; -import org.openecomp.aai.db.schema.DBIndex; -import org.openecomp.aai.db.schema.ManageTitanSchema; +import org.onap.aai.AAISetup; +import org.onap.aai.db.schema.DBIndex; +import org.onap.aai.db.schema.ManageTitanSchema; import java.io.IOException; import java.util.Set; diff --git a/aai-resources/src/test/java/org/openecomp/aai/serialization/queryformats/QueryFormatTestHelper.java b/aai-resources/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java index f9a511a..53d1d29 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/serialization/queryformats/QueryFormatTestHelper.java +++ b/aai-resources/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.serialization.queryformats; +package org.onap.aai.serialization.queryformats; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -26,9 +27,9 @@ import org.apache.tinkerpop.gremlin.structure.io.IoCore; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; -import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.utils.UrlBuilder; import java.io.IOException; import java.lang.reflect.Field; @@ -40,8 +41,8 @@ import static org.mockito.Mockito.when; public class QueryFormatTestHelper { - public static final String testResources = "src/test/resources/org/openecomp/aai/serialization/queryformats/"; - public static final String graphsonResources = "src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/"; + public static final String testResources = "src/test/resources/org.onap.aai/serialization/queryformats/"; + public static final String graphsonResources = "src/test/resources/org.onap.aai/serialization/queryformats/graphson/"; public static void mockPathed(UrlBuilder mock) throws AAIFormatVertexException { diff --git a/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java b/aai-resources/src/test/java/org/onap/aai/transforms/JoltTestUtil.java index d691545..7784724 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java +++ b/aai-resources/src/test/java/org/onap/aai/transforms/JoltTestUtil.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.transforms; +package org.onap.aai.transforms; import com.bazaarvoice.jolt.ArrayOrderObliviousDiffy; diff --git a/aai-resources/src/test/java/org/openecomp/aai/transforms/LowerHyphenToLowerCamelConverterTest.java b/aai-resources/src/test/java/org/onap/aai/transforms/LowerHyphenToLowerCamelConverterTest.java index 4f408b0..43afa68 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/transforms/LowerHyphenToLowerCamelConverterTest.java +++ b/aai-resources/src/test/java/org/onap/aai/transforms/LowerHyphenToLowerCamelConverterTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.transforms; +package org.onap.aai.transforms; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/aai-resources/src/test/java/org/openecomp/aai/transforms/MapTraverserTest.java b/aai-resources/src/test/java/org/onap/aai/transforms/MapTraverserTest.java index 78fc88d..092e0fd 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/transforms/MapTraverserTest.java +++ b/aai-resources/src/test/java/org/onap/aai/transforms/MapTraverserTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.transforms; +package org.onap.aai.transforms; import com.bazaarvoice.jolt.JsonUtils; import org.junit.Test; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAIAppServletContextListenerTest.java b/aai-resources/src/test/java/org/onap/aai/util/AAIAppServletContextListenerTest.java index a148bea..c079007 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/AAIAppServletContextListenerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/util/AAIAppServletContextListenerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -29,8 +30,8 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.logging.ErrorLogHelper; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.logging.ErrorLogHelper; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.agent.PowerMockAgent; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAICSVWriterTest.java b/aai-resources/src/test/java/org/onap/aai/util/AAICSVWriterTest.java index 4f2dfd1..dae280f 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/AAICSVWriterTest.java +++ b/aai-resources/src/test/java/org/onap/aai/util/AAICSVWriterTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import org.junit.After; import org.junit.Before; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAIRSyncUtilityTest.java b/aai-resources/src/test/java/org/onap/aai/util/AAIRSyncUtilityTest.java index c8765f6..34f353d 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/AAIRSyncUtilityTest.java +++ b/aai-resources/src/test/java/org/onap/aai/util/AAIRSyncUtilityTest.java @@ -1,30 +1,31 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.aai.AAISetup; +import org.onap.aai.AAISetup; import java.io.File; import java.lang.reflect.Field; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DataConversionHelperTest.java b/aai-resources/src/test/java/org/onap/aai/util/DataConversionHelperTest.java index 860c56c..3eb21b1 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/DataConversionHelperTest.java +++ b/aai-resources/src/test/java/org/onap/aai/util/DataConversionHelperTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import org.junit.Rule; import org.junit.Test; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestConfig.java b/aai-resources/src/test/java/org/onap/aai/util/DbTestConfig.java index 20a4307..eac8350 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestConfig.java +++ b/aai-resources/src/test/java/org/onap/aai/util/DbTestConfig.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import java.io.*; import java.net.InetAddress; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestFileWatcher.java b/aai-resources/src/test/java/org/onap/aai/util/DbTestFileWatcher.java index 55caba8..9141bd6 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestFileWatcher.java +++ b/aai-resources/src/test/java/org/onap/aai/util/DbTestFileWatcher.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import java.io.File; import java.util.TimerTask; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestGetFileTime.java b/aai-resources/src/test/java/org/onap/aai/util/DbTestGetFileTime.java index d56a4d2..aa8aff8 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestGetFileTime.java +++ b/aai-resources/src/test/java/org/onap/aai/util/DbTestGetFileTime.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import java.io.File; import java.io.IOException; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestProcessBuilder.java b/aai-resources/src/test/java/org/onap/aai/util/DbTestProcessBuilder.java index 306e46e..9777f79 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestProcessBuilder.java +++ b/aai-resources/src/test/java/org/onap/aai/util/DbTestProcessBuilder.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import java.io.*; import java.nio.file.attribute.FileTime; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/HbaseSaltPrefixerTest.java b/aai-resources/src/test/java/org/onap/aai/util/HbaseSaltPrefixerTest.java index ba15e00..b42c592 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/HbaseSaltPrefixerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/util/HbaseSaltPrefixerTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import org.junit.Test; diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtilTest.java b/aai-resources/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java index 96150da..90e16c3 100644 --- a/aai-resources/src/test/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtilTest.java +++ b/aai-resources/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. 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, * 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. * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - -package org.openecomp.aai.util; +package org.onap.aai.util; import org.junit.Test; |