From 0756759f39e125b02d63b4e93de83b3c6b13beea Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:09:30 -0800 Subject: First part of onap rename This is the first commit of the rename. This commit changes refereces to org.openecomp.appc > org.onap.appc that occur within files. The package folder structure is not changed in this commit. Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c Signed-off-by: Patrick Brady Issue-ID: APPC-13 --- .../openecomp/appc/cache/CacheStrategiesTest.java | 2 +- .../openecomp/appc/cache/impl/LRUCacheTest.java | 2 +- .../appc/cache/impl/MetadataCacheFactoryTest.java | 4 ++-- .../appc/cache/impl/MetadataCacheImplTest.java | 4 ++-- .../org/openecomp/appc/concurrent/TestSignal.java | 4 ++-- .../configuration/DefaultConfigurationTest.java | 2 +- .../openecomp/appc/encryption/TestEncryption.java | 4 ++-- .../appc/exceptions/APPCExceptionTest.java | 2 +- .../appc/exceptions/InvalidInputExceptionTest.java | 2 +- .../appc/exceptions/InvalidStateExceptionTest.java | 2 +- .../exceptions/UnknownProviderExceptionTest.java | 2 +- .../test/java/org/openecomp/appc/i18n/MsgTest.java | 2 +- .../appc/logging/LoggingConstantsTest.java | 2 +- .../appc/metadata/TestMetadataService.java | 4 ++-- .../objects/DependencyModelIdentifierTest.java | 4 ++-- .../org/openecomp/appc/pool/CachedElementTest.java | 22 +++++++++++----------- .../test/java/org/openecomp/appc/pool/Element.java | 2 +- .../java/org/openecomp/appc/pool/PoolTest.java | 20 ++++++++++---------- .../java/org/openecomp/appc/pool/Testable.java | 2 +- .../java/org/openecomp/appc/util/TestJsonUtil.java | 4 ++-- .../org/openecomp/appc/util/TestStringHelper.java | 4 ++-- .../appc/util/TestStructuredPropertyHelper.java | 6 +++--- 22 files changed, 51 insertions(+), 51 deletions(-) (limited to 'appc-common/src/test/java/org/openecomp') diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java index c9e0e0034..41ceb4303 100644 --- a/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/cache/CacheStrategiesTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.cache; +package org.onap.appc.cache; import org.junit.Assert; import org.junit.Test; diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java index 75be94dac..3f4233d86 100644 --- a/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/cache/impl/LRUCacheTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.cache.impl; +package org.onap.appc.cache.impl; import org.junit.Assert; import org.junit.Test; diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java index db6658686..386118025 100644 --- a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheFactoryTest.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.cache.impl; +package org.onap.appc.cache.impl; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.openecomp.appc.cache.CacheStrategies; +import org.onap.appc.cache.CacheStrategies; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java index 48cc67921..c68fb48dc 100644 --- a/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/cache/impl/MetadataCacheImplTest.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.cache.impl; +package org.onap.appc.cache.impl; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.cache.CacheStrategies; +import org.onap.appc.cache.CacheStrategies; import org.powermock.reflect.Whitebox; import static org.mockito.Mockito.spy; diff --git a/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java b/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java index 1148a6701..e86fe54a1 100644 --- a/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java +++ b/appc-common/src/test/java/org/openecomp/appc/concurrent/TestSignal.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.concurrent; +package org.onap.appc.concurrent; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -33,7 +33,7 @@ import java.util.Date; import java.util.concurrent.TimeoutException; import org.junit.Test; -import org.openecomp.appc.concurrent.Signal; +import org.onap.appc.concurrent.Signal; public class TestSignal { diff --git a/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java b/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java index 53bd9dbd6..a423eae81 100644 --- a/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/configuration/DefaultConfigurationTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.configuration; +package org.onap.appc.configuration; import org.junit.Assert; import org.junit.Before; diff --git a/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java b/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java index 3c7483fb5..aa9664d2e 100644 --- a/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java +++ b/appc-common/src/test/java/org/openecomp/appc/encryption/TestEncryption.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.encryption; +package org.onap.appc.encryption; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import org.junit.Test; -import org.openecomp.appc.encryption.EncryptionTool; +import org.onap.appc.encryption.EncryptionTool; public class TestEncryption { diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java index fc6aa9e27..a9611a2df 100644 --- a/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/APPCExceptionTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.exceptions; +package org.onap.appc.exceptions; import org.junit.Assert; import org.junit.Test; diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java index 5608a1221..9822ff7ee 100644 --- a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidInputExceptionTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.exceptions; +package org.onap.appc.exceptions; import org.junit.Assert; import org.junit.Test; diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java index a095a5187..c008131f1 100644 --- a/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/InvalidStateExceptionTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.exceptions; +package org.onap.appc.exceptions; import org.junit.Assert; import org.junit.Test; diff --git a/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java b/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java index d3fc15d3b..d3c7ab5ef 100644 --- a/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/exceptions/UnknownProviderExceptionTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.exceptions; +package org.onap.appc.exceptions; import org.junit.Assert; import org.junit.Test; diff --git a/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java b/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java index aa30ae7e1..1a541a5d4 100644 --- a/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/i18n/MsgTest.java @@ -1,4 +1,4 @@ -package org.openecomp.appc.i18n; +package org.onap.appc.i18n; import static org.junit.Assert.assertNotNull; diff --git a/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java b/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java index 547f180ca..1238b494b 100644 --- a/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/logging/LoggingConstantsTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.logging; +package org.onap.appc.logging; import org.junit.Test; import org.powermock.reflect.Whitebox; diff --git a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java index aa9e4533e..7316fe8a6 100644 --- a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java +++ b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metadata; +package org.onap.appc.metadata; import org.onap.ccsdk.sli.core.dblib.DbLibService; import com.sun.rowset.CachedRowSetImpl; import org.mockito.Mockito; -import org.openecomp.appc.metadata.impl.MetadataServiceImpl; +import org.onap.appc.metadata.impl.MetadataServiceImpl; import javax.sql.rowset.CachedRowSet; import java.sql.SQLException; diff --git a/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java b/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java index 214943ec6..95f3312cb 100644 --- a/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/metadata/objects/DependencyModelIdentifierTest.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metadata.objects; +package org.onap.appc.metadata.objects; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.powermock.reflect.Whitebox; -import static org.openecomp.appc.metadata.objects.DependencyModelIdentifier.prime; +import static org.onap.appc.metadata.objects.DependencyModelIdentifier.prime; public class DependencyModelIdentifierTest { private static final String vnfType = "vnfType"; diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java b/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java index 99a417cd9..30e592430 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/CachedElementTest.java @@ -24,7 +24,7 @@ -package org.openecomp.appc.pool; +package org.onap.appc.pool; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -38,14 +38,14 @@ import java.lang.reflect.Method; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.pool.Allocator; -import org.openecomp.appc.pool.CachedElement; -import org.openecomp.appc.pool.Destructor; -import org.openecomp.appc.pool.Pool; -import org.openecomp.appc.pool.PoolDrainedException; -import org.openecomp.appc.pool.PoolExtensionException; -import org.openecomp.appc.pool.PoolSpecificationException; -import org.openecomp.appc.pool.*; +import org.onap.appc.pool.Allocator; +import org.onap.appc.pool.CachedElement; +import org.onap.appc.pool.Destructor; +import org.onap.appc.pool.Pool; +import org.onap.appc.pool.PoolDrainedException; +import org.onap.appc.pool.PoolExtensionException; +import org.onap.appc.pool.PoolSpecificationException; +import org.onap.appc.pool.*; public class CachedElementTest implements Allocator, Destructor { @@ -255,7 +255,7 @@ public class CachedElementTest implements Allocator, Destructor pool) { @@ -267,7 +267,7 @@ public class CachedElementTest implements Allocator, Destructor pool) { diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/Element.java b/appc-common/src/test/java/org/openecomp/appc/pool/Element.java index 41255b62f..877fab2aa 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/Element.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/Element.java @@ -24,7 +24,7 @@ -package org.openecomp.appc.pool; +package org.onap.appc.pool; import java.io.IOException; diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java b/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java index 2c9194503..db9a2e615 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/PoolTest.java @@ -24,7 +24,7 @@ -package org.openecomp.appc.pool; +package org.onap.appc.pool; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,13 +39,13 @@ import java.lang.reflect.Proxy; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.pool.Allocator; -import org.openecomp.appc.pool.Destructor; -import org.openecomp.appc.pool.Pool; -import org.openecomp.appc.pool.PoolDrainedException; -import org.openecomp.appc.pool.PoolExtensionException; -import org.openecomp.appc.pool.PoolSpecificationException; -import org.openecomp.appc.pool.*; +import org.onap.appc.pool.Allocator; +import org.onap.appc.pool.Destructor; +import org.onap.appc.pool.Pool; +import org.onap.appc.pool.PoolDrainedException; +import org.onap.appc.pool.PoolExtensionException; +import org.onap.appc.pool.PoolSpecificationException; +import org.onap.appc.pool.*; public class PoolTest implements Allocator, Destructor { @@ -299,7 +299,7 @@ public class PoolTest implements Allocator, Destructor { } /** - * @see org.openecomp.appc.pool.Destructor#destroy(java.io.Closeable, org.openecomp.appc.pool.Pool) + * @see org.onap.appc.pool.Destructor#destroy(java.io.Closeable, org.onap.appc.pool.Pool) */ @Override public void destroy(Testable obj, Pool pool) { @@ -312,7 +312,7 @@ public class PoolTest implements Allocator, Destructor { } /** - * @see org.openecomp.appc.pool.Allocator#allocate(org.openecomp.appc.pool.Pool) + * @see org.onap.appc.pool.Allocator#allocate(org.onap.appc.pool.Pool) */ @Override public Testable allocate(Pool pool) { diff --git a/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java b/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java index b6e69ef0c..fb2fa75ef 100644 --- a/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java +++ b/appc-common/src/test/java/org/openecomp/appc/pool/Testable.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.pool; +package org.onap.appc.pool; import java.io.Closeable; diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java b/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java index 87e70e43d..270f90f05 100644 --- a/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java +++ b/appc-common/src/test/java/org/openecomp/appc/util/TestJsonUtil.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.util; +package org.onap.appc.util; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.util.JsonUtil; +import org.onap.appc.util.JsonUtil; import java.io.IOException; import java.util.HashMap; diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java b/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java index 74f0b121b..06957cf2d 100644 --- a/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java +++ b/appc-common/src/test/java/org/openecomp/appc/util/TestStringHelper.java @@ -24,7 +24,7 @@ -package org.openecomp.appc.util; +package org.onap.appc.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; import java.util.Properties; import org.junit.Test; -import org.openecomp.appc.util.StringHelper; +import org.onap.appc.util.StringHelper; public class TestStringHelper { diff --git a/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java b/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java index 0c019e9ee..06c27d0dd 100644 --- a/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java +++ b/appc-common/src/test/java/org/openecomp/appc/util/TestStructuredPropertyHelper.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.util; +package org.onap.appc.util; import static org.junit.Assert.*; @@ -32,8 +32,8 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.util.StructuredPropertyHelper; -import org.openecomp.appc.util.StructuredPropertyHelper.Node; +import org.onap.appc.util.StructuredPropertyHelper; +import org.onap.appc.util.StructuredPropertyHelper.Node; /** * This class is used to test the structured property helper class. -- cgit 1.2.3-korg