diff options
Diffstat (limited to 'aai-core/src/main')
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java (renamed from aai-core/src/main/java/org/openecomp/aai/audit/ListEndpoints.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/auth/exceptions/AAIUnrecognizedFunctionException.java (renamed from aai-core/src/main/java/org/openecomp/aai/auth/exceptions/AAIUnrecognizedFunctionException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/DbMethHelper.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/DbMethHelper.java) | 33 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/props/AAIProperties.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/AuditDoc.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/AuditDoc.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/AuditOXM.java) | 39 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/AuditTitan.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/AuditTitan.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/Auditor.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/Auditor.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/AuditorFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/AuditorFactory.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/CompareByName.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/CompareByName.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/DBIndex.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/DBIndex.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/DBProperty.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/DBProperty.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/EdgeProperty.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/EdgeProperty.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/ManageTitanSchema.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/ManageTitanSchema.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/Named.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/Named.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/db/schema/ScriptDriver.java (renamed from aai-core/src/main/java/org/openecomp/aai/db/schema/ScriptDriver.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java (renamed from aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java) | 45 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dbgen/GenTester.java (renamed from aai-core/src/main/java/org/openecomp/aai/dbgen/GenTester.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dbgen/PropertyLimitDesc.java (renamed from aai-core/src/main/java/org/openecomp/aai/dbgen/PropertyLimitDesc.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java (renamed from aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java) | 35 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java (renamed from aai-core/src/main/java/org/openecomp/aai/dbmap/AAIGraph.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dbmap/DBConnectionType.java (renamed from aai-core/src/main/java/org/openecomp/aai/dbmap/DBConnectionType.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java (renamed from aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSProducer.java (renamed from aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSProducer.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/notificationEvent/NotificationEvent.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/notificationEvent/ObjectFactory.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessage.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessageData.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessageDatum.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessages.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/package-info.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restPolicyException/Fault.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/Fault.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restPolicyException/ObjectFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/ObjectFactory.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restPolicyException/PolicyException.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/PolicyException.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RESTResponse.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/RESTResponse.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RequestError.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/RequestError.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/Info.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restResponseInfo/Info.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/ObjectFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restResponseInfo/ObjectFactory.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restServiceException/Fault.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/Fault.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restServiceException/ObjectFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/ObjectFactory.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restServiceException/RESTResponse.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/RESTResponse.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restServiceException/RequestError.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/RequestError.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/restServiceException/ServiceException.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/ServiceException.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/translog/TransactionLogEntries.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java (renamed from aai-core/src/main/java/org/openecomp/aai/domain/translog/TransactionLogEntry.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/exceptions/AAIException.java (renamed from aai-core/src/main/java/org/openecomp/aai/exceptions/AAIException.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/exceptions/AAIExceptionWithInfo.java (renamed from aai-core/src/main/java/org/openecomp/aai/exceptions/AAIExceptionWithInfo.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java (renamed from aai-core/src/main/java/org/openecomp/aai/extensions/AAIExtensionMap.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/extensions/ExtensionController.java (renamed from aai-core/src/main/java/org/openecomp/aai/extensions/ExtensionController.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/ingestModel/CreateWidgetModels.java (renamed from aai-core/src/main/java/org/openecomp/aai/ingestModel/CreateWidgetModels.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/Introspector.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/Introspector.java) | 29 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/IntrospectorFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/IntrospectorFactory.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/IntrospectorWalker.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/IntrospectorWalker.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/JSONStrategy.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/Loader.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/Loader.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/LoaderFactory.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/MarshallerProperties.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/MarshallerProperties.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/ModelInjestor.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/ModelInjestor.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/ModelType.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/ModelType.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/MoxyLoader.java) | 29 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/MoxyStrategy.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/PojoInjestor.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/PojoInjestor.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/PojoLoader.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/PojoLoader.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/PojoStrategy.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/PojoStrategy.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicate.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/PropertyPredicate.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicates.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/PropertyPredicates.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/Version.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/Version.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/Visibility.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/Visibility.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/Wanderer.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/Wanderer.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/exceptions/AAIUnknownObjectException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/exceptions/AAIUnmarshallingException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/generator/CreateExample.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/generator/CreateExample.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataCopy.java) | 35 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataLinkReader.java) | 35 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataLinkWriter.java) | 37 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffect.java) | 37 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunner.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffectRunner.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunnerHelper.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffectRunnerHelper.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/CreateUUID.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/CreateUUID.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/DefaultFields.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/DefaultFields.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/InjectKeysFromURI.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/InjectKeysFromURI.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/IntrospectorValidator.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/IntrospectorValidator.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/Issue.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/Issue.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/IssueResolver.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/IssueResolver.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/IssueType.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/IssueType.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/RemoveNonVisibleProperty.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/RemoveNonVisibleProperty.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/introspection/tools/Severity.java (renamed from aai-core/src/main/java/org/openecomp/aai/introspection/tools/Severity.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/CNName.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/CNName.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayout.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/CustomLogPatternLayout.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayoutEncoder.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/CustomLogPatternLayoutEncoder.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/DME2RestFlag.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/DME2RestFlag.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/EcompElapsedTime.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/EcompElapsedTime.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/EcompEncoder.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/EcompEncoder.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/EcompPatternLayout.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/EcompPatternLayout.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/EcompStartTime.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/EelfClassOfCaller.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/EelfClassOfCaller.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/ErrorLogHelper.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/ErrorLogHelper.java) | 99 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/ErrorObject.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/ErrorObject.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/ErrorObjectFormatException.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/ErrorObjectNotFoundException.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/LogFormatTools.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/LogFormatTools.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/LoggingContext.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/LoggingContext.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/LoggingContextNotExistsException.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/StopWatch.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/StopWatch.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java (renamed from aai-core/src/main/java/org/openecomp/aai/logging/StopWatchNotStartedException.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/AAIIdentityMapParseException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/AmbiguousMapAAIException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/LegacyQueryParser.java) | 39 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/ObjectNameQueryParser.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/ObjectNameQueryParser.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParser.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParserStrategy.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/RelationshipQueryParser.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/RelationshipQueryParser.java) | 33 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/TraversalStrategy.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/UniqueRelationshipQueryParser.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueRelationshipQueryParser.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueStrategy.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueURIQueryParser.java) | 33 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/relationship/RelationshipToURI.java) | 41 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/uri/Parsable.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIParser.java) | 39 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToDBKey.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToExtensionInformation.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToObject.java) | 29 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToRelationshipObject.java) | 33 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java (renamed from aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIValidate.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java (renamed from aai-core/src/main/java/org/openecomp/aai/query/builder/GraphTraversalBuilder.java) | 37 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java (renamed from aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinQueryBuilder.java) | 37 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java (renamed from aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinTraversal.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java (renamed from aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinUnique.java) | 29 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java (renamed from aai-core/src/main/java/org/openecomp/aai/query/builder/QueryBuilder.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java (renamed from aai-core/src/main/java/org/openecomp/aai/query/builder/TraversalQuery.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/rest/RestTokens.java (renamed from aai-core/src/main/java/org/openecomp/aai/rest/RestTokens.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java (renamed from aai-core/src/main/java/org/openecomp/aai/rest/db/DBRequest.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java (renamed from aai-core/src/main/java/org/openecomp/aai/rest/db/HttpEntry.java) | 67 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/rest/ueb/NotificationEvent.java (renamed from aai-core/src/main/java/org/openecomp/aai/rest/ueb/NotificationEvent.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/rest/ueb/UEBNotification.java (renamed from aai-core/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java) | 37 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/CustomJacksonJaxBJsonProvider.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/HttpMethod.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/HttpMethod.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/JettyObfuscationConversionCommandLineUtil.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/MediaType.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/MediaType.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/RESTAPI.java) | 47 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/search/GremlinGroovyShellSingleton.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/util/GenerateEdgeRules.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/util/GenerateEdgeRules.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java (renamed from aai-core/src/main/java/org/openecomp/aai/restcore/util/URITools.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/AAIDirection.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/AAIDirection.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/DBSerializer.java) | 61 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/DeleteSemantic.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/DeleteSemantic.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperties.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperties.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperty.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperty.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgePropertyMap.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRule.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRule.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRules.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRules.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/EdgeType.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeType.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/GetAllPool.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/GetAllPool.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/GraphSingleton.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/GraphSingleton.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/LegacyDBSerializer.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/LegacyDBSerializer.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/MultiplicityRule.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/MultiplicityRule.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/TitanGraphSingleton.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/TitanGraphSingleton.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/exceptions/EdgeMultiplicityException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/engines/QueryStyle.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/engines/QueryStyle.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/engines/TitanDBEngine.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/engines/TitanDBEngine.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/engines/TransactionalGraphEngine.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/engines/TransactionalGraphEngine.java) | 35 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GraphTraversalQueryEngine.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinPipelineQueryEngine.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GremlinPipelineQueryEngine.java) | 33 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinQueryEngine.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GremlinQueryEngine.java) | 33 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/QueryEngine.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/Console.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Console.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/Format.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Format.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/FormatFactory.java) | 29 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatMapper.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/FormatMapper.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Formatter.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/GraphSON.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/IdURL.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/PathedURL.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/RawFormat.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/RawFormat.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Resource.java) | 37 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/SimpleFormat.java) | 27 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/SubGraphStyle.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/SubGraphStyle.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Depth.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Depth.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Inject.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Inject.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/NodesOnly.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/NodesOnly.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Setter.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Setter.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjector.java) | 25 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java) | 31 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedEdge.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java (renamed from aai-core/src/main/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertex.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java (renamed from aai-core/src/main/java/org/openecomp/aai/tasks/ScheduledTasks.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIApiServerURLBase.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAIApiServerURLBase.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAIApiVersion.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAICSVWriter.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAICSVWriter.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIConfig.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAIConfig.java) | 21 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIConfigCommandLinePropGetter.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAIConfigCommandLinePropGetter.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIConstants.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIMechIdConfig.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAIMechIdConfig.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIRSyncUtility.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/AAIRSyncUtility.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/Entity.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/Entity.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/EntityList.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/EntityList.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/FileWatcher.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/FileWatcher.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/FormatDate.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/FormatDate.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java) | 23 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/HbaseSaltPrefixer.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/KeyValueList.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/KeyValueList.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/MapperUtil.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/MapperUtil.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/PojoUtils.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/PojoUtils.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/Request.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/Request.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/RestObject.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/RestObject.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/RestURLEncoder.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/RestURLEncoder.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/StoreNotificationEvent.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java) | 33 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/UniquePropertyCheck.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/UniquePropertyCheck.java) | 19 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/swagger/Api.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/swagger/Api.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/swagger/Definition.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/swagger/Definition.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/swagger/GenerateSwagger.java (renamed from aai-core/src/main/java/org/openecomp/aai/util/swagger/GenerateSwagger.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/workarounds/LegacyURITransformer.java (renamed from aai-core/src/main/java/org/openecomp/aai/workarounds/LegacyURITransformer.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/workarounds/NamingExceptions.java (renamed from aai-core/src/main/java/org/openecomp/aai/workarounds/NamingExceptions.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/java/org/onap/aai/workarounds/RemoveDME2QueryParams.java (renamed from aai-core/src/main/java/org/openecomp/aai/workarounds/RemoveDME2QueryParams.java) | 17 | ||||
-rw-r--r-- | aai-core/src/main/resources/EdgeRules.ftl | 39 | ||||
-rw-r--r-- | aai-core/src/main/resources/swagger.html.ftl | 39 |
223 files changed, 2681 insertions, 2412 deletions
diff --git a/aai-core/src/main/java/org/openecomp/aai/audit/ListEndpoints.java b/aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java index 1e1df8fc..5ee973a3 100644 --- a/aai-core/src/main/java/org/openecomp/aai/audit/ListEndpoints.java +++ b/aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.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.audit; +package org.onap.aai.audit; import java.util.ArrayList; import java.util.HashMap; @@ -32,13 +33,13 @@ import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.Introspector; -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.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.Introspector; +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.introspection.exceptions.AAIUnknownObjectException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.common.base.CaseFormat; diff --git a/aai-core/src/main/java/org/openecomp/aai/auth/exceptions/AAIUnrecognizedFunctionException.java b/aai-core/src/main/java/org/onap/aai/auth/exceptions/AAIUnrecognizedFunctionException.java index 5a3d8c6b..9758f98f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/auth/exceptions/AAIUnrecognizedFunctionException.java +++ b/aai-core/src/main/java/org/onap/aai/auth/exceptions/AAIUnrecognizedFunctionException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.auth.exceptions; -package org.openecomp.aai.auth.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AAIUnrecognizedFunctionException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/db/DbMethHelper.java b/aai-core/src/main/java/org/onap/aai/db/DbMethHelper.java index 79172d9b..a3e4d71f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/DbMethHelper.java +++ b/aai-core/src/main/java/org/onap/aai/db/DbMethHelper.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.db; +package org.onap.aai.db; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,14 +33,14 @@ import java.util.Optional; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.relationship.RelationshipToURI; -import org.openecomp.aai.query.builder.QueryBuilder; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.relationship.RelationshipToURI; +import org.onap.aai.query.builder.QueryBuilder; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; public class DbMethHelper { diff --git a/aai-core/src/main/java/org/openecomp/aai/db/props/AAIProperties.java b/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java index caac6744..e481f3cf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/props/AAIProperties.java +++ b/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.db.props; -package org.openecomp.aai.db.props; - -import org.openecomp.aai.introspection.Version; +import org.onap.aai.introspection.Version; public class AAIProperties { public static final String NODE_TYPE = "aai-node-type"; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditDoc.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditDoc.java index 58d3dc0b..dc92b220 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditDoc.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditDoc.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.db.schema; +package org.onap.aai.db.schema; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditOXM.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java index b7aab081..e64f3ea3 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditOXM.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.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.db.schema; +package org.onap.aai.db.schema; import java.io.IOException; import java.util.Arrays; @@ -33,21 +34,21 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.openecomp.aai.serialization.db.EdgeRule; -import org.openecomp.aai.serialization.db.EdgeRules; +import org.onap.aai.serialization.db.EdgeRule; +import org.onap.aai.serialization.db.EdgeRules; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.Introspector; -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.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.Introspector; +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.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.util.AAIConstants; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.common.collect.Multimap; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditTitan.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditTitan.java index 814afd6b..ec1c2394 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditTitan.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditTitan.java @@ -1,32 +1,29 @@ -/*- +/** * ============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.onap.aai.db.schema; -package org.openecomp.aai.db.schema; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -66,7 +63,7 @@ public class AuditTitan extends Auditor { TitanManagement mgmt = graph.openManagement(); Iterable<PropertyKey> iterable = mgmt.getRelationTypes(PropertyKey.class); Iterator<PropertyKey> titanProperties = iterable.iterator(); - PropertyKey propKey = null; + PropertyKey propKey; while (titanProperties.hasNext()) { propKey = titanProperties.next(); DBProperty prop = new DBProperty(); @@ -86,7 +83,7 @@ public class AuditTitan extends Auditor { TitanManagement mgmt = graph.openManagement(); Iterable<TitanGraphIndex> iterable = mgmt.getGraphIndexes(Vertex.class); Iterator<TitanGraphIndex> titanIndexes = iterable.iterator(); - TitanGraphIndex titanIndex = null; + TitanGraphIndex titanIndex; while (titanIndexes.hasNext()) { titanIndex = titanIndexes.next(); if (titanIndex.isCompositeIndex()) { @@ -112,7 +109,7 @@ public class AuditTitan extends Auditor { TitanManagement mgmt = graph.openManagement(); Iterable<EdgeLabel> iterable = mgmt.getRelationTypes(EdgeLabel.class); Iterator<EdgeLabel> titanEdgeLabels = iterable.iterator(); - EdgeLabel edgeLabel = null; + EdgeLabel edgeLabel; while (titanEdgeLabels.hasNext()) { edgeLabel = titanEdgeLabels.next(); EdgeProperty edgeProperty = new EdgeProperty(); diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/Auditor.java b/aai-core/src/main/java/org/onap/aai/db/schema/Auditor.java index cd811041..3e7a595a 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/Auditor.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/Auditor.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.db.schema; +package org.onap.aai.db.schema; import java.util.*; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditorFactory.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditorFactory.java index 66e52820..9af7a11a 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/AuditorFactory.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditorFactory.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.db.schema; -package org.openecomp.aai.db.schema; - -import org.openecomp.aai.introspection.Version; +import org.onap.aai.introspection.Version; import com.thinkaurelius.titan.core.TitanGraph; public class AuditorFactory { diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/CompareByName.java b/aai-core/src/main/java/org/onap/aai/db/schema/CompareByName.java index ea45fd75..56fe1a44 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/CompareByName.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/CompareByName.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.db.schema; +package org.onap.aai.db.schema; import java.util.Comparator; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/DBIndex.java b/aai-core/src/main/java/org/onap/aai/db/schema/DBIndex.java index 9e157a93..9093a202 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/DBIndex.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/DBIndex.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.db.schema; +package org.onap.aai.db.schema; import java.util.LinkedHashSet; import java.util.Set; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/DBProperty.java b/aai-core/src/main/java/org/onap/aai/db/schema/DBProperty.java index d142e15b..e4f98cbf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/DBProperty.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/DBProperty.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.db.schema; -package org.openecomp.aai.db.schema; - -import org.openecomp.aai.introspection.Introspector; +import org.onap.aai.introspection.Introspector; import com.thinkaurelius.titan.core.Cardinality; public class DBProperty implements Named { diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/EdgeProperty.java b/aai-core/src/main/java/org/onap/aai/db/schema/EdgeProperty.java index 0f9fafd3..4d0cf3b8 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/EdgeProperty.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/EdgeProperty.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.db.schema; +package org.onap.aai.db.schema; import com.thinkaurelius.titan.core.Multiplicity; import org.codehaus.jackson.annotate.JsonProperty; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/ManageTitanSchema.java b/aai-core/src/main/java/org/onap/aai/db/schema/ManageTitanSchema.java index a7f835e6..0260543f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/ManageTitanSchema.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/ManageTitanSchema.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.db.schema; +package org.onap.aai.db.schema; import java.util.ArrayList; import java.util.List; @@ -26,7 +27,7 @@ import java.util.Set; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.introspection.Version; import com.thinkaurelius.titan.core.PropertyKey; import com.thinkaurelius.titan.core.TitanGraph; import com.thinkaurelius.titan.core.schema.SchemaStatus; diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/Named.java b/aai-core/src/main/java/org/onap/aai/db/schema/Named.java index 850af57a..4f1f9e62 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/Named.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/Named.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.db.schema; +package org.onap.aai.db.schema; public interface Named { diff --git a/aai-core/src/main/java/org/openecomp/aai/db/schema/ScriptDriver.java b/aai-core/src/main/java/org/onap/aai/db/schema/ScriptDriver.java index 9a90ea28..fc494883 100644 --- a/aai-core/src/main/java/org/openecomp/aai/db/schema/ScriptDriver.java +++ b/aai-core/src/main/java/org/onap/aai/db/schema/ScriptDriver.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.db.schema; +package org.onap.aai.db.schema; import java.io.IOException; @@ -26,9 +27,9 @@ import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.util.AAIConfig; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Version; +import org.onap.aai.util.AAIConfig; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.thinkaurelius.titan.core.TitanFactory; diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java b/aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java index f2d6a4b8..afc7807b 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java +++ b/aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.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.dbgen; +package org.onap.aai.dbgen; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -47,20 +48,20 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.serialization.db.AAIDirection; -import org.openecomp.aai.serialization.db.EdgeProperty; -import org.openecomp.aai.util.AAIConfig; -import org.openecomp.aai.util.AAIConstants; -import org.openecomp.aai.util.FormatDate; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.introspection.ModelType; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.serialization.db.AAIDirection; +import org.onap.aai.serialization.db.EdgeProperty; +import org.onap.aai.util.AAIConfig; +import org.onap.aai.util.AAIConstants; +import org.onap.aai.util.FormatDate; import com.att.eelf.configuration.Configuration; import com.att.eelf.configuration.EELFLogger; diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/GenTester.java b/aai-core/src/main/java/org/onap/aai/dbgen/GenTester.java index 7847d3d6..7b9eb2fc 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbgen/GenTester.java +++ b/aai-core/src/main/java/org/onap/aai/dbgen/GenTester.java @@ -1,34 +1,35 @@ -/*- +/** * ============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.dbgen; +package org.onap.aai.dbgen; import com.att.eelf.configuration.Configuration; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.thinkaurelius.titan.core.TitanGraph; import com.thinkaurelius.titan.core.schema.TitanManagement; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.util.AAIConfig; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.util.AAIConfig; +import org.onap.aai.util.AAIConstants; import java.util.Properties; diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/PropertyLimitDesc.java b/aai-core/src/main/java/org/onap/aai/dbgen/PropertyLimitDesc.java index 8d0bf7ea..b71e7ba2 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbgen/PropertyLimitDesc.java +++ b/aai-core/src/main/java/org/onap/aai/dbgen/PropertyLimitDesc.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.dbgen; +package org.onap.aai.dbgen; public enum PropertyLimitDesc { SHOW_NONE, diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java b/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java index 9f85d029..132ad46a 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java +++ b/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.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.dbgen; +package org.onap.aai.dbgen; import java.util.HashMap; @@ -28,15 +29,15 @@ import java.util.Optional; import java.util.Set; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.EdgeRule; -import org.openecomp.aai.serialization.db.EdgeRules; -import org.openecomp.aai.util.AAIConfig; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.introspection.ModelType; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.EdgeRule; +import org.onap.aai.serialization.db.EdgeRules; +import org.onap.aai.util.AAIConfig; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/dbmap/AAIGraph.java b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java index 4921b91d..e62e8e7e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbmap/AAIGraph.java +++ b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.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.dbmap; +package org.onap.aai.dbmap; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -31,9 +32,9 @@ import java.util.Properties; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.io.IoCore; -import org.openecomp.aai.dbgen.SchemaGenerator; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.dbgen.SchemaGenerator; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.util.AAIConstants; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/dbmap/DBConnectionType.java b/aai-core/src/main/java/org/onap/aai/dbmap/DBConnectionType.java index 26495275..6095c86c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbmap/DBConnectionType.java +++ b/aai-core/src/main/java/org/onap/aai/dbmap/DBConnectionType.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.dbmap; +package org.onap.aai.dbmap; public enum DBConnectionType { REALTIME, diff --git a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java index 8acb954e..d5389981 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java +++ b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.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.dmaap; +package org.onap.aai.dmaap; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -28,8 +29,11 @@ import com.sun.jersey.api.client.WebResource; import org.apache.log4j.MDC; import org.json.JSONException; import org.json.JSONObject; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.util.AAIConstants; +import org.onap.aai.logging.LoggingContext; +import org.onap.aai.logging.LoggingContext.LoggingField; +import org.onap.aai.logging.LoggingContext.StatusCode; import javax.jms.JMSException; import javax.jms.Message; @@ -103,6 +107,9 @@ public class AAIDmaapEventJMSConsumer implements MessageListener { LOGGER.info(eventName + "|" + aaiEvent); if ("AAI-EVENT".equals(eventName)) { this.sentWithHttp(this.httpClient, this.aaiEventUrl, aaiEvent); + } else { + LoggingContext.statusCode(StatusCode.ERROR); + LOGGER.error(eventName + "|Event Topic invalid."); } } catch (java.net.SocketException e) { if (!e.getMessage().contains("Connection reset")) { diff --git a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSProducer.java b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSProducer.java index 89ed9348..d41f4768 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSProducer.java +++ b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSProducer.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.dmaap; +package org.onap.aai.dmaap; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQQueue; import org.json.JSONObject; -import org.openecomp.aai.util.AAIConfig; +import org.onap.aai.util.AAIConfig; import org.springframework.jms.connection.CachingConnectionFactory; import org.springframework.jms.core.JmsTemplate; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/notificationEvent/NotificationEvent.java b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java index 865d045f..311b8574 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/notificationEvent/NotificationEvent.java +++ b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.notificationEvent; +package org.onap.aai.domain.notificationEvent; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/notificationEvent/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java index c331aab2..7c456fb2 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/notificationEvent/ObjectFactory.java +++ b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.notificationEvent; +package org.onap.aai.domain.notificationEvent; import javax.xml.bind.annotation.XmlRegistry; @@ -34,7 +35,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.openecomp.aai.domain.notificationEvent package. + * generated in the org.onap.aai.domain.notificationEvent package. * <p>An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -50,7 +51,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.aai.domain.notificationEvent + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.onap.aai.domain.notificationEvent * */ public ObjectFactory() { diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessage.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java index b3f03247..03a31ff3 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessage.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.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.domain.responseMessage; +package org.onap.aai.domain.responseMessage; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -33,7 +34,7 @@ import javax.xml.bind.annotation.XmlType; "aaiResponseMessageDescription", "aaiResponseMessageData", }) -@XmlRootElement(name = "aai-response-message", namespace = "http://org.openecomp.aai.inventory") +@XmlRootElement(name = "aai-response-message", namespace = "http://org.onap.aai.inventory") public class AAIResponseMessage { @XmlElement(name = "aai-response-message-code", required = true) diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessageData.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java index 16f9c6dd..5c33b93c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessageData.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.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.domain.responseMessage; +package org.onap.aai.domain.responseMessage; // @@ -43,7 +44,7 @@ import javax.xml.bind.annotation.XmlType; "aaiResponseMessageDatum", "any" }) -@XmlRootElement(name = "aai-response-message-data", namespace = "http://org.openecomp.aai.inventory") +@XmlRootElement(name = "aai-response-message-data", namespace = "http://org.onap.aai.inventory") public class AAIResponseMessageData { @XmlElement(name = "aai-response-message-datum") diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessageDatum.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java index 8b64651f..3830ce7f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessageDatum.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.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.domain.responseMessage; +package org.onap.aai.domain.responseMessage; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -33,7 +34,7 @@ import javax.xml.bind.annotation.XmlType; }) -@XmlRootElement(name = "aai-response-message-datum", namespace = "http://org.openecomp.aai.inventory") +@XmlRootElement(name = "aai-response-message-datum", namespace = "http://org.onap.aai.inventory") public class AAIResponseMessageDatum { @XmlElement(name = "aai-response-message-datum-key", required = true) diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessages.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java index 41ff5610..7e5fb686 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/AAIResponseMessages.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.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.domain.responseMessage; +package org.onap.aai.domain.responseMessage; // @@ -64,7 +65,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="flavor-selflink" type="{urn:ietf:params:xml:ns:yang:ietf-inet-types}uri" minOccurs="0"/> * <element name="flavor-disabled" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/> - * <element ref="{http://org.openecomp.aai.inventory/v3}relationship-list" minOccurs="0"/> + * <element ref="{http://org.onap.aai.inventory/v3}relationship-list" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -84,7 +85,7 @@ import javax.xml.bind.annotation.XmlType; "aaiResponseMessage", "any" }) -@XmlRootElement(name = "aai-response-messages", namespace = "http://org.openecomp.aai.inventory") +@XmlRootElement(name = "aai-response-messages", namespace = "http://org.onap.aai.inventory") public class AAIResponseMessages { @XmlElement(name = "aai-response-message") protected List<AAIResponseMessage> aaiResponseMessage; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/package-info.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java index cfb4981a..43e98422 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/responseMessage/package-info.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // @javax.xml.bind.annotation.XmlSchema( - namespace = "http://org.openecomp.aai.inventory", + namespace = "http://org.onap.aai.inventory", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.openecomp.aai.domain.responseMessage; +package org.onap.aai.domain.responseMessage; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/Fault.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/Fault.java index f32268b3..dd937095 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/Fault.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/Fault.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.restPolicyException; +package org.onap.aai.domain.restPolicyException; import java.util.ArrayList; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/ObjectFactory.java index 3cf31ed0..ba09fa78 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/ObjectFactory.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/ObjectFactory.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.restPolicyException; +package org.onap.aai.domain.restPolicyException; import javax.xml.bind.annotation.XmlRegistry; @@ -34,7 +35,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.openecomp.aai.domain.restPolicyException package. + * generated in the org.onap.aai.domain.restPolicyException package. * <p>An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -50,7 +51,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.aai.domain.restPolicyException + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.onap.aai.domain.restPolicyException * */ public ObjectFactory() { diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/PolicyException.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/PolicyException.java index a55ce62e..3f8d7641 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/PolicyException.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/PolicyException.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.domain.restPolicyException; +package org.onap.aai.domain.restPolicyException; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/RESTResponse.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RESTResponse.java index 9aa55f44..df4a86bf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/RESTResponse.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RESTResponse.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.domain.restServiceException; +package org.onap.aai.domain.restPolicyException; import java.util.HashMap; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/RequestError.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RequestError.java index a4d4e74e..e210341d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/RequestError.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RequestError.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.domain.restPolicyException; +package org.onap.aai.domain.restPolicyException; import java.util.HashMap; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restResponseInfo/Info.java b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/Info.java index 6a1f8e4a..4ef131a1 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restResponseInfo/Info.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/Info.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.restResponseInfo; +package org.onap.aai.domain.restResponseInfo; import java.util.ArrayList; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restResponseInfo/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/ObjectFactory.java index 70449586..461e7f0c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restResponseInfo/ObjectFactory.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/ObjectFactory.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.restResponseInfo; +package org.onap.aai.domain.restResponseInfo; import javax.xml.bind.annotation.XmlRegistry; @@ -34,7 +35,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.openecomp.aai.domain.restResponseInfo package. + * generated in the org.onap.aai.domain.restResponseInfo package. * <p>An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -50,7 +51,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.aai.domain.restResponseInfo + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.onap.aai.domain.restResponseInfo * */ public ObjectFactory() { diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/Fault.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/Fault.java index 3356a54f..2032cc5c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/Fault.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/Fault.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.restServiceException; +package org.onap.aai.domain.restServiceException; import java.util.ArrayList; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ObjectFactory.java index 09c59b3c..6aef298c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/ObjectFactory.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ObjectFactory.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.restServiceException; +package org.onap.aai.domain.restServiceException; import javax.xml.bind.annotation.XmlRegistry; @@ -34,7 +35,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.openecomp.aai.domain.restServiceException package. + * generated in the org.onap.aai.domain.restServiceException package. * <p>An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -50,7 +51,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.aai.domain.restServiceException + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.onap.aai.domain.restServiceException * */ public ObjectFactory() { diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/RESTResponse.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RESTResponse.java index eb9deb27..c571fd1c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restPolicyException/RESTResponse.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RESTResponse.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.domain.restPolicyException; +package org.onap.aai.domain.restServiceException; import java.util.HashMap; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/RequestError.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RequestError.java index edc465e8..00b59839 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/RequestError.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RequestError.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.domain.restServiceException; +package org.onap.aai.domain.restServiceException; import java.util.HashMap; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/ServiceException.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ServiceException.java index 56872696..0b392a03 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/restServiceException/ServiceException.java +++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ServiceException.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.domain.restServiceException; +package org.onap.aai.domain.restServiceException; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/translog/TransactionLogEntries.java b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java index 83f5b356..cbd39c3f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/translog/TransactionLogEntries.java +++ b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java @@ -1,23 +1,24 @@ -/*- +/** * ============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. */ - // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> @@ -26,7 +27,7 @@ // -package org.openecomp.aai.domain.translog; +package org.onap.aai.domain.translog; import java.util.ArrayList; import java.util.List; @@ -110,7 +111,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "", propOrder = { "transactionLogEntries" }) -@XmlRootElement(name = "transaction-log-entries", namespace = "http://org.openecomp.aai.inventory") +@XmlRootElement(name = "transaction-log-entries", namespace = "http://org.onap.aai.inventory") public class TransactionLogEntries { protected List<TransactionLogEntry> transactionLogEntries; diff --git a/aai-core/src/main/java/org/openecomp/aai/domain/translog/TransactionLogEntry.java b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java index c3724e34..37905a4e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/domain/translog/TransactionLogEntry.java +++ b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.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.domain.translog; +package org.onap.aai.domain.translog; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -46,7 +47,7 @@ import org.eclipse.persistence.oxm.annotations.XmlCDATA; "notificationEntityLink", "notificationAction" }) -@XmlRootElement(name = "transaction-log-entry", namespace = "http://org.openecomp.aai.inventory") +@XmlRootElement(name = "transaction-log-entry", namespace = "http://org.onap.aai.inventory") public class TransactionLogEntry { @XmlElement(name = "transaction-log-entry-id", required = true) diff --git a/aai-core/src/main/java/org/openecomp/aai/exceptions/AAIException.java b/aai-core/src/main/java/org/onap/aai/exceptions/AAIException.java index e3bce33d..349013b7 100644 --- a/aai-core/src/main/java/org/openecomp/aai/exceptions/AAIException.java +++ b/aai-core/src/main/java/org/onap/aai/exceptions/AAIException.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.exceptions; +package org.onap.aai.exceptions; import java.util.Collection; import java.util.LinkedList; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.logging.ErrorObject; -import org.openecomp.aai.logging.ErrorObjectNotFoundException; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.logging.ErrorObject; +import org.onap.aai.logging.ErrorObjectNotFoundException; public class AAIException extends Exception { diff --git a/aai-core/src/main/java/org/openecomp/aai/exceptions/AAIExceptionWithInfo.java b/aai-core/src/main/java/org/onap/aai/exceptions/AAIExceptionWithInfo.java index f1b15396..992c6983 100644 --- a/aai-core/src/main/java/org/openecomp/aai/exceptions/AAIExceptionWithInfo.java +++ b/aai-core/src/main/java/org/onap/aai/exceptions/AAIExceptionWithInfo.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.exceptions; +package org.onap.aai.exceptions; import java.util.HashMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/extensions/AAIExtensionMap.java b/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java index 11a8920a..3d7969ed 100644 --- a/aai-core/src/main/java/org/openecomp/aai/extensions/AAIExtensionMap.java +++ b/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java @@ -1,33 +1,34 @@ -/*- +/** * ============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.extensions; +package org.onap.aai.extensions; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.openecomp.aai.domain.responseMessage.AAIResponseMessages; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.rest.db.DBRequest; -import org.openecomp.aai.rest.db.HttpEntry; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.domain.responseMessage.AAIResponseMessages; +import org.onap.aai.introspection.Loader; +import org.onap.aai.rest.db.DBRequest; +import org.onap.aai.rest.db.HttpEntry; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; @@ -56,7 +57,7 @@ public class AAIExtensionMap { // ----------------------------------------------------------------------- // headers | javax.ws.rs.core.HttpHeaders (RO) // ----------------------------------------------------------------------- - // objFromRequestType | String (ex. ?org.openecomp.aai.domain.yang.Vce?) (RO) + // objFromRequestType | String (ex. ?org.onap.aai.domain.yang.Vce?) (RO) // ----------------------------------------------------------------------- // objFromRequest | $TYPE {ObjFromRequestType) (RO) // ----------------------------------------------------------------------- @@ -74,7 +75,7 @@ public class AAIExtensionMap { // ----------------------------------------------------------------------- // precheckAddedList | java.util.HashMap // ----------------------------------------------------------------------- - // precheckResponseMessages | org.openecomp.aai.extensions.AAIResponseMessages + // precheckResponseMessages | org.onap.aai.extensions.AAIResponseMessages // ======================================================================= private String message; diff --git a/aai-core/src/main/java/org/openecomp/aai/extensions/ExtensionController.java b/aai-core/src/main/java/org/onap/aai/extensions/ExtensionController.java index cea0e9b7..2ec30561 100644 --- a/aai-core/src/main/java/org/openecomp/aai/extensions/ExtensionController.java +++ b/aai-core/src/main/java/org/onap/aai/extensions/ExtensionController.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.extensions; +package org.onap.aai.extensions; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.util.AAIConfig; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.util.AAIConfig; import java.lang.reflect.Method; @@ -45,7 +46,7 @@ public class ExtensionController { public void runExtension(String apiVersion, String namespace, String resourceName, String methodName, AAIExtensionMap aaiExtMap, boolean isPreExtension) throws AAIException { - String extensionClassName = "org.openecomp.aai.extensions." + String extensionClassName = "org.onap.aai.extensions." + apiVersion.toLowerCase() + "." + namespace + "." + resourceName + "Extension"; String defaultErrorCallback = resourceName + "ExtensionErrorCallback"; diff --git a/aai-core/src/main/java/org/openecomp/aai/ingestModel/CreateWidgetModels.java b/aai-core/src/main/java/org/onap/aai/ingestModel/CreateWidgetModels.java index 885f2854..98b0dc44 100644 --- a/aai-core/src/main/java/org/openecomp/aai/ingestModel/CreateWidgetModels.java +++ b/aai-core/src/main/java/org/onap/aai/ingestModel/CreateWidgetModels.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.ingestModel; +package org.onap.aai.ingestModel; import java.io.File; import java.io.PrintWriter; @@ -29,13 +30,13 @@ import java.util.UUID; import javax.xml.transform.stream.StreamSource; -import org.openecomp.aai.introspection.Introspector; -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.util.AAIConfig; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.introspection.Introspector; +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.util.AAIConfig; +import org.onap.aai.util.AAIConstants; /** * The Class CreateWidgetModels. diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/Introspector.java b/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java index 1c8baa10..f6609bff 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/Introspector.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java @@ -1,36 +1,37 @@ -/*- +/** * ============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.introspection; +package org.onap.aai.introspection; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.common.base.CaseFormat; import org.apache.commons.lang.ClassUtils; import org.eclipse.persistence.exceptions.DynamicException; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.restcore.MediaType; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.workarounds.NamingExceptions; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.restcore.MediaType; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.workarounds.NamingExceptions; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/IntrospectorFactory.java b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorFactory.java index 760f3a68..801905dd 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/IntrospectorFactory.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorFactory.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.introspection; +package org.onap.aai.introspection; public class IntrospectorFactory { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/IntrospectorWalker.java b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorWalker.java index 8eddac3b..09dcec64 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/IntrospectorWalker.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorWalker.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.introspection; +package org.onap.aai.introspection; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; import java.util.HashSet; import java.util.LinkedHashSet; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/JSONStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java index 7dae20ee..db8a7d06 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/JSONStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java @@ -1,28 +1,29 @@ -/*- +/** * ============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.introspection; +package org.onap.aai.introspection; import org.json.simple.JSONObject; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.schema.enums.PropertyMetadata; import java.io.UnsupportedEncodingException; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/Loader.java b/aai-core/src/main/java/org/onap/aai/introspection/Loader.java index b5a029ed..579a4644 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/Loader.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/Loader.java @@ -1,28 +1,29 @@ -/*- +/** * ============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.onap.aai.introspection; -package org.openecomp.aai.introspection; - -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.introspection.exceptions.AAIUnmarshallingException; -import org.openecomp.aai.restcore.MediaType; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.introspection.exceptions.AAIUnmarshallingException; +import org.onap.aai.restcore.MediaType; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/LoaderFactory.java b/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java index 23b762d5..63f95539 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/LoaderFactory.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.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.introspection; +package org.onap.aai.introspection; public class LoaderFactory { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/MarshallerProperties.java b/aai-core/src/main/java/org/onap/aai/introspection/MarshallerProperties.java index 8b9ee2d7..7f0251f4 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/MarshallerProperties.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/MarshallerProperties.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection; -package org.openecomp.aai.introspection; - -import org.openecomp.aai.restcore.MediaType; +import org.onap.aai.restcore.MediaType; public class MarshallerProperties { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/ModelInjestor.java b/aai-core/src/main/java/org/onap/aai/introspection/ModelInjestor.java index c6503a69..4cdfc634 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/ModelInjestor.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/ModelInjestor.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.introspection; +package org.onap.aai.introspection; import org.eclipse.persistence.dynamic.DynamicType; import org.eclipse.persistence.jaxb.JAXBContextProperties; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.util.AAIConstants; import javax.xml.bind.JAXBException; import java.io.File; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/ModelType.java b/aai-core/src/main/java/org/onap/aai/introspection/ModelType.java index 132b754b..49d2c90e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/ModelType.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/ModelType.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.introspection; +package org.onap.aai.introspection; public enum ModelType { MOXY, POJO, JSON diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/MoxyLoader.java b/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java index 80b05aee..cf81349c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/MoxyLoader.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.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.introspection; +package org.onap.aai.introspection; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -27,12 +28,12 @@ import com.google.common.collect.ImmutableMap; import org.eclipse.persistence.dynamic.DynamicEntity; import org.eclipse.persistence.jaxb.UnmarshallerProperties; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.introspection.exceptions.AAIUnmarshallingException; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.restcore.MediaType; -import org.openecomp.aai.workarounds.NamingExceptions; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.introspection.exceptions.AAIUnmarshallingException; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.restcore.MediaType; +import org.onap.aai.workarounds.NamingExceptions; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/MoxyStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java index b3cda8d3..ce04fb7f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/MoxyStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.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.introspection; +package org.onap.aai.introspection; import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; @@ -32,9 +33,9 @@ import org.eclipse.persistence.mappings.DatabaseMapping; import org.eclipse.persistence.oxm.XMLField; import org.eclipse.persistence.oxm.mappings.XMLCompositeCollectionMapping; import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping; -import org.openecomp.aai.restcore.MediaType; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.restcore.MediaType; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.schema.enums.PropertyMetadata; import org.springframework.web.util.UriUtils; import javax.xml.bind.JAXBException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/PojoInjestor.java b/aai-core/src/main/java/org/onap/aai/introspection/PojoInjestor.java index 3eea2420..5de9c748 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/PojoInjestor.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/PojoInjestor.java @@ -1,27 +1,28 @@ -/*- +/** * ============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.introspection; +package org.onap.aai.introspection; import org.eclipse.persistence.jaxb.JAXBContextFactory; -import org.openecomp.aai.db.props.AAIProperties; +import org.onap.aai.db.props.AAIProperties; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class PojoInjestor { - private String POJO_CLASSPATH = "org.openecomp.aai.domain.yang"; + private String POJO_CLASSPATH = "org.onap.aai.domain.yang"; private final Pattern classNamePattern = Pattern.compile("\\.(v\\d+)\\."); public PojoInjestor() { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/PojoLoader.java b/aai-core/src/main/java/org/onap/aai/introspection/PojoLoader.java index 927ac4bc..62a7dc0e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/PojoLoader.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/PojoLoader.java @@ -1,36 +1,37 @@ -/*- +/** * ============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.introspection; +package org.onap.aai.introspection; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.common.base.CaseFormat; import org.eclipse.persistence.jaxb.JAXBContextFactory; import org.eclipse.persistence.jaxb.UnmarshallerProperties; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.introspection.exceptions.AAIUnmarshallingException; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.restcore.MediaType; -import org.openecomp.aai.workarounds.NamingExceptions; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.introspection.exceptions.AAIUnmarshallingException; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.restcore.MediaType; +import org.onap.aai.workarounds.NamingExceptions; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -42,7 +43,7 @@ import java.util.Map; public class PojoLoader extends Loader { private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(PojoLoader.class); - private static final String POJO_BASE_PACKAGE_NAME = "org.openecomp.aai.domain.yang"; + private static final String POJO_BASE_PACKAGE_NAME = "org.onap.aai.domain.yang"; protected JAXBContext context; private final String pojoPackageName; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/PojoStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/PojoStrategy.java index 7f114bd3..6e29729d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/PojoStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/PojoStrategy.java @@ -1,34 +1,35 @@ -/*- +/** * ============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.introspection; +package org.onap.aai.introspection; import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; import com.google.common.collect.Multimap; import org.eclipse.persistence.jaxb.UnmarshallerProperties; -import org.openecomp.aai.annotations.Metadata; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.restcore.MediaType; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.annotations.Metadata; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.restcore.MediaType; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.schema.enums.PropertyMetadata; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/PropertyPredicate.java b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicate.java index 38bdf82c..f4f666d9 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/PropertyPredicate.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicate.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.introspection; +package org.onap.aai.introspection; import java.util.function.BiPredicate; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/PropertyPredicates.java b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicates.java index c7bbb0c0..90edd5e9 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/PropertyPredicates.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicates.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection; -package org.openecomp.aai.introspection; - -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.schema.enums.PropertyMetadata; import java.util.Map; import java.util.Set; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/Version.java b/aai-core/src/main/java/org/onap/aai/introspection/Version.java index 9e1fab2a..e51231a4 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/Version.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/Version.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.introspection; +package org.onap.aai.introspection; public enum Version { v8, diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/Visibility.java b/aai-core/src/main/java/org/onap/aai/introspection/Visibility.java index 4c467a50..4e5b6b76 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/Visibility.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/Visibility.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.introspection; +package org.onap.aai.introspection; public enum Visibility { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/Wanderer.java b/aai-core/src/main/java/org/onap/aai/introspection/Wanderer.java index 5429d999..156de4fd 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/Wanderer.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/Wanderer.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection; -package org.openecomp.aai.introspection; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/exceptions/AAIUnknownObjectException.java b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java index e8ed4e8a..6bc53553 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/exceptions/AAIUnknownObjectException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection.exceptions; -package org.openecomp.aai.introspection.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AAIUnknownObjectException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/exceptions/AAIUnmarshallingException.java b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java index bbbcdd67..bf9c7a36 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/exceptions/AAIUnmarshallingException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection.exceptions; -package org.openecomp.aai.introspection.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AAIUnmarshallingException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/generator/CreateExample.java b/aai-core/src/main/java/org/onap/aai/introspection/generator/CreateExample.java index 1b3444fd..4d11c9ad 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/generator/CreateExample.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/generator/CreateExample.java @@ -1,27 +1,28 @@ -/*- +/** * ============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.onap.aai.introspection.generator; -package org.openecomp.aai.introspection.generator; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.*; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.*; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataCopy.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java index 53c85013..d002f068 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataCopy.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java @@ -1,35 +1,36 @@ -/*- +/** * ============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.introspection.sideeffect; +package org.onap.aai.introspection.sideeffect; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; -import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMultiplePropertiesException; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.restcore.util.URITools; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; +import org.onap.aai.introspection.sideeffect.exceptions.AAIMultiplePropertiesException; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.restcore.util.URITools; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataLinkReader.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java index 89b03eab..20387205 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataLinkReader.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java @@ -1,35 +1,36 @@ -/*- +/** * ============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.introspection.sideeffect; +package org.onap.aai.introspection.sideeffect; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.restcore.util.URITools; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.restcore.util.URITools; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataLinkWriter.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java index 6e93098d..f98e07c4 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/DataLinkWriter.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java @@ -1,36 +1,37 @@ -/*- +/** * ============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.introspection.sideeffect; +package org.onap.aai.introspection.sideeffect; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMultiplePropertiesException; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.uri.URIToObject; -import org.openecomp.aai.restcore.util.URITools; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.sideeffect.exceptions.AAIMultiplePropertiesException; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.uri.URIToObject; +import org.onap.aai.restcore.util.URITools; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffect.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java index 95da72f3..08520608 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffect.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java @@ -1,36 +1,37 @@ -/*- +/** * ============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.introspection.sideeffect; +package org.onap.aai.introspection.sideeffect; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.introspection.ModelType; +import org.onap.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffectRunner.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunner.java index 3b33be1f..0129b991 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffectRunner.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunner.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.introspection.sideeffect; +package org.onap.aai.introspection.sideeffect; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffectRunnerHelper.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunnerHelper.java index d94cd4a1..f73216c8 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/SideEffectRunnerHelper.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunnerHelper.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.onap.aai.introspection.sideeffect; -package org.openecomp.aai.introspection.sideeffect; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Wanderer; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Wanderer; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java index aca299c7..c159c808 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection.sideeffect.exceptions; -package org.openecomp.aai.introspection.sideeffect.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AAIMissingRequiredPropertyException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java index 91bb8168..d9be4d5f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection.sideeffect.exceptions; -package org.openecomp.aai.introspection.sideeffect.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AAIMultiplePropertiesException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/CreateUUID.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/CreateUUID.java index f88a099c..b049c5c5 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/CreateUUID.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/CreateUUID.java @@ -1,27 +1,28 @@ -/*- +/** * ============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.onap.aai.introspection.tools; -package org.openecomp.aai.introspection.tools; - -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.schema.enums.PropertyMetadata; import java.util.Map; import java.util.UUID; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/DefaultFields.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/DefaultFields.java index c242d983..fdf45a1f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/DefaultFields.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/DefaultFields.java @@ -1,27 +1,28 @@ -/*- +/** * ============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.onap.aai.introspection.tools; -package org.openecomp.aai.introspection.tools; - -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.schema.enums.PropertyMetadata; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/InjectKeysFromURI.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/InjectKeysFromURI.java index d9aea008..e7d86273 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/InjectKeysFromURI.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/InjectKeysFromURI.java @@ -1,28 +1,29 @@ -/*- +/** * ============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.onap.aai.introspection.tools; -package org.openecomp.aai.introspection.tools; - -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.uri.URIToObject; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.parsers.uri.URIToObject; import java.net.URI; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/IntrospectorValidator.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/IntrospectorValidator.java index cf77a3be..b4878e38 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/IntrospectorValidator.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/IntrospectorValidator.java @@ -1,32 +1,33 @@ -/*- +/** * ============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.onap.aai.introspection.tools; -package org.openecomp.aai.introspection.tools; - -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.IntrospectorWalker; -import org.openecomp.aai.introspection.Visibility; -import org.openecomp.aai.introspection.Wanderer; -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.IntrospectorWalker; +import org.onap.aai.introspection.Visibility; +import org.onap.aai.introspection.Wanderer; +import org.onap.aai.schema.enums.PropertyMetadata; import java.util.*; diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/Issue.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/Issue.java index 173d1f77..54bc393b 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/Issue.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/Issue.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.introspection.tools; -package org.openecomp.aai.introspection.tools; - -import org.openecomp.aai.introspection.Introspector; +import org.onap.aai.introspection.Introspector; public class Issue { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/IssueResolver.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueResolver.java index e62e9b72..c5a6bc28 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/IssueResolver.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueResolver.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.introspection.tools; +package org.onap.aai.introspection.tools; public interface IssueResolver { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/IssueType.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueType.java index 5606926c..c532c5f7 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/IssueType.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueType.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.introspection.tools; +package org.onap.aai.introspection.tools; public enum IssueType { MISSING_REQUIRED_PROP, MISSING_KEY_PROP, EXCEEDED_ALLOWED_DEPTH, PROPERTY_NOT_VISIBLE, DEPENDENT_PROP_NOT_FOUND diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/RemoveNonVisibleProperty.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/RemoveNonVisibleProperty.java index 4de0fa60..f15df84e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/RemoveNonVisibleProperty.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/RemoveNonVisibleProperty.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.introspection.tools; +package org.onap.aai.introspection.tools; public class RemoveNonVisibleProperty implements IssueResolver { diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/Severity.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/Severity.java index 14501794..ab3d1aa3 100644 --- a/aai-core/src/main/java/org/openecomp/aai/introspection/tools/Severity.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/Severity.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.introspection.tools; +package org.onap.aai.introspection.tools; public enum Severity { WARNING, diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/CNName.java b/aai-core/src/main/java/org/onap/aai/logging/CNName.java index 4c152e3c..7adbe87a 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/CNName.java +++ b/aai-core/src/main/java/org/onap/aai/logging/CNName.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.logging; +package org.onap.aai.logging; import ch.qos.logback.access.pattern.AccessConverter; import ch.qos.logback.access.spi.IAccessEvent; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/CustomLogPatternLayout.java b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayout.java index 7a8bbd92..a0b265ba 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/CustomLogPatternLayout.java +++ b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayout.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.logging; +package org.onap.aai.logging; public class CustomLogPatternLayout extends ch.qos.logback.access.PatternLayout { static { diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/CustomLogPatternLayoutEncoder.java b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayoutEncoder.java index a34c6cc6..57f7347d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/CustomLogPatternLayoutEncoder.java +++ b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayoutEncoder.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.logging; +package org.onap.aai.logging; import ch.qos.logback.access.PatternLayout; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/DME2RestFlag.java b/aai-core/src/main/java/org/onap/aai/logging/DME2RestFlag.java index f97f1843..16633d5c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/DME2RestFlag.java +++ b/aai-core/src/main/java/org/onap/aai/logging/DME2RestFlag.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.logging; +package org.onap.aai.logging; import ch.qos.logback.access.pattern.AccessConverter; import ch.qos.logback.access.spi.IAccessEvent; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/EcompElapsedTime.java b/aai-core/src/main/java/org/onap/aai/logging/EcompElapsedTime.java index f56a6fe5..6025ba9d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/EcompElapsedTime.java +++ b/aai-core/src/main/java/org/onap/aai/logging/EcompElapsedTime.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.logging; -package org.openecomp.aai.logging; - -import org.openecomp.aai.logging.LoggingContext.LoggingField; +import org.onap.aai.logging.LoggingContext.LoggingField; import ch.qos.logback.classic.pattern.ClassicConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/EcompEncoder.java b/aai-core/src/main/java/org/onap/aai/logging/EcompEncoder.java index 396e51c3..e10ad4d0 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/EcompEncoder.java +++ b/aai-core/src/main/java/org/onap/aai/logging/EcompEncoder.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.logging; +package org.onap.aai.logging; import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.encoder.PatternLayoutEncoder; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/EcompPatternLayout.java b/aai-core/src/main/java/org/onap/aai/logging/EcompPatternLayout.java index bbf32793..a08c021f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/EcompPatternLayout.java +++ b/aai-core/src/main/java/org/onap/aai/logging/EcompPatternLayout.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.logging; +package org.onap.aai.logging; import ch.qos.logback.classic.PatternLayout; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/EcompStartTime.java b/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java index c08b273a..e0594cf0 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/EcompStartTime.java +++ b/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.logging; -package org.openecomp.aai.logging; - -import org.openecomp.aai.logging.LoggingContext.LoggingField; +import org.onap.aai.logging.LoggingContext.LoggingField; import ch.qos.logback.classic.pattern.ClassicConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/EelfClassOfCaller.java b/aai-core/src/main/java/org/onap/aai/logging/EelfClassOfCaller.java index bc745d38..4450be34 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/EelfClassOfCaller.java +++ b/aai-core/src/main/java/org/onap/aai/logging/EelfClassOfCaller.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.logging; +package org.onap.aai.logging; import ch.qos.logback.classic.pattern.NamedConverter; import ch.qos.logback.classic.spi.CallerData; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorLogHelper.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorLogHelper.java index 919029a0..1c3ab853 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorLogHelper.java +++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorLogHelper.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.logging; +package org.onap.aai.logging; import java.io.FileInputStream; import java.io.IOException; @@ -39,11 +40,11 @@ import javax.xml.bind.Marshaller; import org.apache.commons.lang.StringUtils; import org.slf4j.MDC; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.logging.LoggingContext.StatusCode; -import org.openecomp.aai.util.AAIConfig; -import org.openecomp.aai.util.AAIConstants; -import org.openecomp.aai.util.MapperUtil; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.logging.LoggingContext.StatusCode; +import org.onap.aai.util.AAIConfig; +import org.onap.aai.util.AAIConstants; +import org.onap.aai.util.MapperUtil; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -235,16 +236,16 @@ public class ErrorLogHelper { try { if(eo.getCategory().equals("1")) { - context = JAXBContext.newInstance(org.openecomp.aai.domain.restPolicyException.Fault.class); + context = JAXBContext.newInstance(org.onap.aai.domain.restPolicyException.Fault.class); Marshaller m = context.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - org.openecomp.aai.domain.restPolicyException.ObjectFactory factory = new org.openecomp.aai.domain.restPolicyException.ObjectFactory(); - org.openecomp.aai.domain.restPolicyException.Fault fault = factory.createFault(); - org.openecomp.aai.domain.restPolicyException.Fault.RequestError requestError = factory.createFaultRequestError(); - org.openecomp.aai.domain.restPolicyException.Fault.RequestError.PolicyException policyException = factory.createFaultRequestErrorPolicyException(); - org.openecomp.aai.domain.restPolicyException.Fault.RequestError.PolicyException.Variables polvariables = factory.createFaultRequestErrorPolicyExceptionVariables(); + org.onap.aai.domain.restPolicyException.ObjectFactory factory = new org.onap.aai.domain.restPolicyException.ObjectFactory(); + org.onap.aai.domain.restPolicyException.Fault fault = factory.createFault(); + org.onap.aai.domain.restPolicyException.Fault.RequestError requestError = factory.createFaultRequestError(); + org.onap.aai.domain.restPolicyException.Fault.RequestError.PolicyException policyException = factory.createFaultRequestErrorPolicyException(); + org.onap.aai.domain.restPolicyException.Fault.RequestError.PolicyException.Variables polvariables = factory.createFaultRequestErrorPolicyExceptionVariables(); policyException.setMessageId("POL" + eo.getRESTErrorCode()); policyException.setText(text.toString()); @@ -263,16 +264,16 @@ public class ErrorLogHelper { } else { - context = JAXBContext.newInstance(org.openecomp.aai.domain.restServiceException.Fault.class); + context = JAXBContext.newInstance(org.onap.aai.domain.restServiceException.Fault.class); Marshaller m = context.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - org.openecomp.aai.domain.restServiceException.ObjectFactory factory = new org.openecomp.aai.domain.restServiceException.ObjectFactory(); - org.openecomp.aai.domain.restServiceException.Fault fault = factory.createFault(); - org.openecomp.aai.domain.restServiceException.Fault.RequestError requestError = factory.createFaultRequestError(); - org.openecomp.aai.domain.restServiceException.Fault.RequestError.ServiceException serviceException = factory.createFaultRequestErrorServiceException(); - org.openecomp.aai.domain.restServiceException.Fault.RequestError.ServiceException.Variables svcvariables = factory.createFaultRequestErrorServiceExceptionVariables(); + org.onap.aai.domain.restServiceException.ObjectFactory factory = new org.onap.aai.domain.restServiceException.ObjectFactory(); + org.onap.aai.domain.restServiceException.Fault fault = factory.createFault(); + org.onap.aai.domain.restServiceException.Fault.RequestError requestError = factory.createFaultRequestError(); + org.onap.aai.domain.restServiceException.Fault.RequestError.ServiceException serviceException = factory.createFaultRequestErrorServiceException(); + org.onap.aai.domain.restServiceException.Fault.RequestError.ServiceException.Variables svcvariables = factory.createFaultRequestErrorServiceExceptionVariables(); serviceException.setMessageId("SVC" + eo.getRESTErrorCode()); serviceException.setText(text.toString()); for (int i=0;i<variables.size();i++) @@ -296,9 +297,9 @@ public class ErrorLogHelper { else { try { if(eo.getCategory().equals("1")) { - org.openecomp.aai.domain.restPolicyException.RESTResponse restresp = new org.openecomp.aai.domain.restPolicyException.RESTResponse(); - org.openecomp.aai.domain.restPolicyException.RequestError reqerr = new org.openecomp.aai.domain.restPolicyException.RequestError(); - org.openecomp.aai.domain.restPolicyException.PolicyException polexc = new org.openecomp.aai.domain.restPolicyException.PolicyException(); + org.onap.aai.domain.restPolicyException.RESTResponse restresp = new org.onap.aai.domain.restPolicyException.RESTResponse(); + org.onap.aai.domain.restPolicyException.RequestError reqerr = new org.onap.aai.domain.restPolicyException.RequestError(); + org.onap.aai.domain.restPolicyException.PolicyException polexc = new org.onap.aai.domain.restPolicyException.PolicyException(); polexc.setMessageId("POL" + eo.getRESTErrorCode()); polexc.setText(text.toString()); polexc.setVariables(variables); @@ -307,9 +308,9 @@ public class ErrorLogHelper { response = (MapperUtil.writeAsJSONString((Object) restresp)); } else { - org.openecomp.aai.domain.restServiceException.RESTResponse restresp = new org.openecomp.aai.domain.restServiceException.RESTResponse(); - org.openecomp.aai.domain.restServiceException.RequestError reqerr = new org.openecomp.aai.domain.restServiceException.RequestError(); - org.openecomp.aai.domain.restServiceException.ServiceException svcexc = new org.openecomp.aai.domain.restServiceException.ServiceException(); + org.onap.aai.domain.restServiceException.RESTResponse restresp = new org.onap.aai.domain.restServiceException.RESTResponse(); + org.onap.aai.domain.restServiceException.RequestError reqerr = new org.onap.aai.domain.restServiceException.RequestError(); + org.onap.aai.domain.restServiceException.ServiceException svcexc = new org.onap.aai.domain.restServiceException.ServiceException(); svcexc.setMessageId("SVC" + eo.getRESTErrorCode()); svcexc.setText(text.toString()); svcexc.setVariables(variables); @@ -361,9 +362,9 @@ public class ErrorLogHelper { Object respObj = null; - org.openecomp.aai.domain.restResponseInfo.ObjectFactory factory = new org.openecomp.aai.domain.restResponseInfo.ObjectFactory(); - org.openecomp.aai.domain.restResponseInfo.Info info = factory.createInfo(); - org.openecomp.aai.domain.restResponseInfo.Info.ResponseMessages responseMessages = factory.createInfoResponseMessages(); + org.onap.aai.domain.restResponseInfo.ObjectFactory factory = new org.onap.aai.domain.restResponseInfo.ObjectFactory(); + org.onap.aai.domain.restResponseInfo.Info info = factory.createInfo(); + org.onap.aai.domain.restResponseInfo.Info.ResponseMessages responseMessages = factory.createInfoResponseMessages(); Iterator<Map.Entry<AAIException, ArrayList<String>>> it = areList.entrySet().iterator(); while (it.hasNext()) { @@ -412,8 +413,8 @@ public class ErrorLogHelper { variables.add(localDataIndex, eo.getErrorCodeString()); try { - org.openecomp.aai.domain.restResponseInfo.Info.ResponseMessages.ResponseMessage responseMessage = factory.createInfoResponseMessagesResponseMessage(); - org.openecomp.aai.domain.restResponseInfo.Info.ResponseMessages.ResponseMessage.Variables infovariables = factory.createInfoResponseMessagesResponseMessageVariables(); + org.onap.aai.domain.restResponseInfo.Info.ResponseMessages.ResponseMessage responseMessage = factory.createInfoResponseMessagesResponseMessage(); + org.onap.aai.domain.restResponseInfo.Info.ResponseMessages.ResponseMessage.Variables infovariables = factory.createInfoResponseMessagesResponseMessageVariables(); responseMessage.setMessageId("INF" + eo.getRESTErrorCode()); responseMessage.setText(text.toString()); @@ -497,16 +498,16 @@ public class ErrorLogHelper { try { if(eo.getCategory().equals("1")) { - context = JAXBContext.newInstance(org.openecomp.aai.domain.restPolicyException.Fault.class); + context = JAXBContext.newInstance(org.onap.aai.domain.restPolicyException.Fault.class); Marshaller m = context.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - org.openecomp.aai.domain.restPolicyException.ObjectFactory factory = new org.openecomp.aai.domain.restPolicyException.ObjectFactory(); - org.openecomp.aai.domain.restPolicyException.Fault fault = factory.createFault(); - org.openecomp.aai.domain.restPolicyException.Fault.RequestError requestError = factory.createFaultRequestError(); - org.openecomp.aai.domain.restPolicyException.Fault.RequestError.PolicyException policyException = factory.createFaultRequestErrorPolicyException(); - org.openecomp.aai.domain.restPolicyException.Fault.RequestError.PolicyException.Variables polvariables = factory.createFaultRequestErrorPolicyExceptionVariables(); + org.onap.aai.domain.restPolicyException.ObjectFactory factory = new org.onap.aai.domain.restPolicyException.ObjectFactory(); + org.onap.aai.domain.restPolicyException.Fault fault = factory.createFault(); + org.onap.aai.domain.restPolicyException.Fault.RequestError requestError = factory.createFaultRequestError(); + org.onap.aai.domain.restPolicyException.Fault.RequestError.PolicyException policyException = factory.createFaultRequestErrorPolicyException(); + org.onap.aai.domain.restPolicyException.Fault.RequestError.PolicyException.Variables polvariables = factory.createFaultRequestErrorPolicyExceptionVariables(); policyException.setMessageId("POL" + eo.getRESTErrorCode()); policyException.setText(text.toString()); @@ -525,16 +526,16 @@ public class ErrorLogHelper { } else { - context = JAXBContext.newInstance(org.openecomp.aai.domain.restServiceException.Fault.class); + context = JAXBContext.newInstance(org.onap.aai.domain.restServiceException.Fault.class); Marshaller m = context.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - org.openecomp.aai.domain.restServiceException.ObjectFactory factory = new org.openecomp.aai.domain.restServiceException.ObjectFactory(); - org.openecomp.aai.domain.restServiceException.Fault fault = factory.createFault(); - org.openecomp.aai.domain.restServiceException.Fault.RequestError requestError = factory.createFaultRequestError(); - org.openecomp.aai.domain.restServiceException.Fault.RequestError.ServiceException serviceException = factory.createFaultRequestErrorServiceException(); - org.openecomp.aai.domain.restServiceException.Fault.RequestError.ServiceException.Variables svcvariables = factory.createFaultRequestErrorServiceExceptionVariables(); + org.onap.aai.domain.restServiceException.ObjectFactory factory = new org.onap.aai.domain.restServiceException.ObjectFactory(); + org.onap.aai.domain.restServiceException.Fault fault = factory.createFault(); + org.onap.aai.domain.restServiceException.Fault.RequestError requestError = factory.createFaultRequestError(); + org.onap.aai.domain.restServiceException.Fault.RequestError.ServiceException serviceException = factory.createFaultRequestErrorServiceException(); + org.onap.aai.domain.restServiceException.Fault.RequestError.ServiceException.Variables svcvariables = factory.createFaultRequestErrorServiceExceptionVariables(); serviceException.setMessageId("POL" + eo.getRESTErrorCode()); serviceException.setText(text.toString()); for (int i=0;i<variables.size();i++) @@ -581,7 +582,7 @@ public class ErrorLogHelper { .append(e.getMessage()) .toString(); - LoggingContext.responseCode(errorObject.getErrorCodeString()); + LoggingContext.responseCode(Integer.toString(errorObject.getHTTPResponseCode().getStatusCode())); LoggingContext.responseDescription(errorMessage); LoggingContext.statusCode(StatusCode.ERROR); diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorObject.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorObject.java index 50822f68..a1bca90e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorObject.java +++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorObject.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.logging; +package org.onap.aai.logging; import javax.ws.rs.core.Response.Status; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorObjectFormatException.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java index 5e3e7464..2d346634 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorObjectFormatException.java +++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.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.logging; +package org.onap.aai.logging; public class ErrorObjectFormatException extends Exception { diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorObjectNotFoundException.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java index fcf72039..524ee183 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorObjectNotFoundException.java +++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.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.logging; +package org.onap.aai.logging; public class ErrorObjectNotFoundException extends Exception { diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/LogFormatTools.java b/aai-core/src/main/java/org/onap/aai/logging/LogFormatTools.java index a07fdc73..702741b1 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/LogFormatTools.java +++ b/aai-core/src/main/java/org/onap/aai/logging/LogFormatTools.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.logging; +package org.onap.aai.logging; import java.time.Instant; import java.time.ZoneOffset; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/LoggingContext.java b/aai-core/src/main/java/org/onap/aai/logging/LoggingContext.java index 9a2d5914..ed332281 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/LoggingContext.java +++ b/aai-core/src/main/java/org/onap/aai/logging/LoggingContext.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.logging; +package org.onap.aai.logging; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/LoggingContextNotExistsException.java b/aai-core/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java index d2149b49..1944b064 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/LoggingContextNotExistsException.java +++ b/aai-core/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.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.logging; +package org.onap.aai.logging; public class LoggingContextNotExistsException extends RuntimeException { diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/StopWatch.java b/aai-core/src/main/java/org/onap/aai/logging/StopWatch.java index 0aa6f0d1..b57387d5 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/StopWatch.java +++ b/aai-core/src/main/java/org/onap/aai/logging/StopWatch.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.logging; -package org.openecomp.aai.logging; - -import org.openecomp.aai.logging.LoggingContext.LoggingField; +import org.onap.aai.logging.LoggingContext.LoggingField; public final class StopWatch { diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/StopWatchNotStartedException.java b/aai-core/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java index 89c59924..d063ef64 100644 --- a/aai-core/src/main/java/org/openecomp/aai/logging/StopWatchNotStartedException.java +++ b/aai-core/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.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.logging; +package org.onap.aai.logging; public class StopWatchNotStartedException extends RuntimeException { diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/AAIIdentityMapParseException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java index bfc35406..03b5695c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/AAIIdentityMapParseException.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.parsers.exceptions; -package org.openecomp.aai.parsers.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AAIIdentityMapParseException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/AmbiguousMapAAIException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java index 4917c14f..f388aaac 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/AmbiguousMapAAIException.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.parsers.exceptions; -package org.openecomp.aai.parsers.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AmbiguousMapAAIException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java index 8911f944..adf28f3e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.parsers.exceptions; -package org.openecomp.aai.parsers.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class DoesNotStartWithValidNamespaceException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/LegacyQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java index 5679fc90..9251be6b 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/LegacyQueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java @@ -1,38 +1,39 @@ -/*- +/** * ============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.parsers.query; +package org.onap.aai.parsers.query; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.parsers.uri.Parsable; -import org.openecomp.aai.parsers.uri.URIParser; -import org.openecomp.aai.parsers.uri.URIToObject; -import org.openecomp.aai.query.builder.QueryBuilder; -import org.openecomp.aai.restcore.util.URITools; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.EdgeType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.parsers.uri.Parsable; +import org.onap.aai.parsers.uri.URIParser; +import org.onap.aai.parsers.uri.URIToObject; +import org.onap.aai.query.builder.QueryBuilder; +import org.onap.aai.restcore.util.URITools; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.EdgeType; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/ObjectNameQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/ObjectNameQueryParser.java index a1d8f740..ce85325f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/ObjectNameQueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/ObjectNameQueryParser.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.parsers.query; +package org.onap.aai.parsers.query; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.query.builder.QueryBuilder; +import org.onap.aai.introspection.Loader; +import org.onap.aai.query.builder.QueryBuilder; public class ObjectNameQueryParser extends QueryParser { diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java index ee4e3941..845b49cf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.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.parsers.query; +package org.onap.aai.parsers.query; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.query.builder.QueryBuilder; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.query.builder.QueryBuilder; import java.net.URI; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParserStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java index b0e6cc23..e8ee099a 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParserStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.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.onap.aai.parsers.query; -package org.openecomp.aai.parsers.query; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.query.builder.QueryBuilder; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.query.builder.QueryBuilder; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/RelationshipQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/RelationshipQueryParser.java index fb4200e5..5943f3cf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/RelationshipQueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/RelationshipQueryParser.java @@ -1,33 +1,34 @@ -/*- +/** * ============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.onap.aai.parsers.query; -package org.openecomp.aai.parsers.query; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.parsers.relationship.RelationshipToURI; -import org.openecomp.aai.parsers.uri.URIParser; -import org.openecomp.aai.query.builder.QueryBuilder; -import org.openecomp.aai.serialization.db.EdgeRules; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.ModelType; +import org.onap.aai.parsers.relationship.RelationshipToURI; +import org.onap.aai.parsers.uri.URIParser; +import org.onap.aai.query.builder.QueryBuilder; +import org.onap.aai.serialization.db.EdgeRules; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/TraversalStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java index 41064597..09f3cb85 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/TraversalStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.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.onap.aai.parsers.query; -package org.openecomp.aai.parsers.query; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.query.builder.QueryBuilder; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.query.builder.QueryBuilder; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueRelationshipQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueRelationshipQueryParser.java index 4739aa47..10566ccb 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueRelationshipQueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueRelationshipQueryParser.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.onap.aai.parsers.query; -package org.openecomp.aai.parsers.query; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.relationship.RelationshipToURI; -import org.openecomp.aai.query.builder.QueryBuilder; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.parsers.relationship.RelationshipToURI; +import org.onap.aai.query.builder.QueryBuilder; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java index 5668036f..cc300fbc 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.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.onap.aai.parsers.query; -package org.openecomp.aai.parsers.query; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.query.builder.QueryBuilder; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.query.builder.QueryBuilder; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueURIQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java index 64fc3df2..1d63f6e4 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/UniqueURIQueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java @@ -1,33 +1,34 @@ -/*- +/** * ============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.onap.aai.parsers.query; -package org.openecomp.aai.parsers.query; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.uri.Parsable; -import org.openecomp.aai.parsers.uri.URIParser; -import org.openecomp.aai.parsers.uri.URIToDBKey; -import org.openecomp.aai.query.builder.QueryBuilder; -import org.openecomp.aai.serialization.db.EdgeType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.parsers.uri.Parsable; +import org.onap.aai.parsers.uri.URIParser; +import org.onap.aai.parsers.uri.URIToDBKey; +import org.onap.aai.query.builder.QueryBuilder; +import org.onap.aai.serialization.db.EdgeType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriBuilder; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/relationship/RelationshipToURI.java b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java index 873f7211..69e44a97 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/relationship/RelationshipToURI.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java @@ -1,40 +1,41 @@ -/*- +/** * ============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.parsers.relationship; +package org.onap.aai.parsers.relationship; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.apache.tinkerpop.gremlin.structure.Direction; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.*; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.parsers.exceptions.AAIIdentityMapParseException; -import org.openecomp.aai.parsers.exceptions.AmbiguousMapAAIException; -import org.openecomp.aai.parsers.uri.URIParser; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.serialization.db.AAIDirection; -import org.openecomp.aai.serialization.db.EdgeRule; -import org.openecomp.aai.serialization.db.EdgeRules; -import org.openecomp.aai.serialization.db.EdgeType; -import org.openecomp.aai.workarounds.LegacyURITransformer; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.*; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.parsers.exceptions.AAIIdentityMapParseException; +import org.onap.aai.parsers.exceptions.AmbiguousMapAAIException; +import org.onap.aai.parsers.uri.URIParser; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.serialization.db.AAIDirection; +import org.onap.aai.serialization.db.EdgeRule; +import org.onap.aai.serialization.db.EdgeRules; +import org.onap.aai.serialization.db.EdgeType; +import org.onap.aai.workarounds.LegacyURITransformer; import javax.ws.rs.core.UriBuilder; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/Parsable.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java index 2488980e..3c8697e9 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/Parsable.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java @@ -1,28 +1,29 @@ -/*- +/** * ============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.onap.aai.parsers.uri; -package org.openecomp.aai.parsers.uri; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.serialization.db.EdgeType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.serialization.db.EdgeType; import javax.ws.rs.core.MultivaluedMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIParser.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java index 4df650de..5480b49f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java @@ -1,36 +1,37 @@ -/*- +/** * ============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.onap.aai.parsers.uri; -package org.openecomp.aai.parsers.uri; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.parsers.exceptions.DoesNotStartWithValidNamespaceException; -import org.openecomp.aai.rest.RestTokens; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.serialization.db.EdgeType; -import org.openecomp.aai.util.AAIConfig; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.introspection.Version; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.parsers.exceptions.DoesNotStartWithValidNamespaceException; +import org.onap.aai.rest.RestTokens; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.serialization.db.EdgeType; +import org.onap.aai.util.AAIConfig; import org.springframework.web.util.UriUtils; import javax.ws.rs.core.MultivaluedHashMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToDBKey.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java index 6aa28e27..1df39b30 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToDBKey.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.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.parsers.uri; +package org.onap.aai.parsers.uri; import com.google.common.base.Joiner; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.serialization.db.EdgeType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.serialization.db.EdgeType; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToExtensionInformation.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java index d32facfa..0b34a45f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToExtensionInformation.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java @@ -1,32 +1,33 @@ -/*- +/** * ============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.parsers.uri; +package org.onap.aai.parsers.uri; import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.restcore.HttpMethod; -import org.openecomp.aai.serialization.db.EdgeType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.restcore.HttpMethod; +import org.onap.aai.serialization.db.EdgeType; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToObject.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java index decd803f..cae5c2e8 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToObject.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.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.onap.aai.parsers.uri; -package org.openecomp.aai.parsers.uri; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.serialization.db.EdgeType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.Version; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.serialization.db.EdgeType; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToRelationshipObject.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java index a5429000..cec55bc3 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIToRelationshipObject.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java @@ -1,33 +1,34 @@ -/*- +/** * ============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.onap.aai.parsers.uri; -package org.openecomp.aai.parsers.uri; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.serialization.db.EdgeType; -import org.openecomp.aai.util.AAIApiServerURLBase; -import org.openecomp.aai.workarounds.LegacyURITransformer; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.Version; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.serialization.db.EdgeType; +import org.onap.aai.util.AAIApiServerURLBase; +import org.onap.aai.workarounds.LegacyURITransformer; import javax.ws.rs.core.MultivaluedMap; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIValidate.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java index b7c0958c..8371fc83 100644 --- a/aai-core/src/main/java/org/openecomp/aai/parsers/uri/URIValidate.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java @@ -1,28 +1,29 @@ -/*- +/** * ============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.onap.aai.parsers.uri; -package org.openecomp.aai.parsers.uri; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.serialization.db.EdgeType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.serialization.db.EdgeType; import javax.ws.rs.core.MultivaluedMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GraphTraversalBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java index ecaadba2..8a585dae 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GraphTraversalBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.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.query.builder; +package org.onap.aai.query.builder; import java.util.ArrayList; import java.util.Arrays; @@ -37,16 +38,16 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.EdgeRule; -import org.openecomp.aai.serialization.db.EdgeRules; -import org.openecomp.aai.serialization.db.EdgeType; -import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.EdgeRule; +import org.onap.aai.serialization.db.EdgeRules; +import org.onap.aai.serialization.db.EdgeType; +import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException; /** * The Class GraphTraversalBuilder. diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinQueryBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java index b151d9d8..62ba5392 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinQueryBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.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.query.builder; +package org.onap.aai.query.builder; import java.util.ArrayList; import java.util.HashMap; @@ -32,16 +33,16 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.restcore.search.GremlinGroovyShellSingleton; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.serialization.db.EdgeRule; -import org.openecomp.aai.serialization.db.EdgeRules; -import org.openecomp.aai.serialization.db.EdgeType; -import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.restcore.search.GremlinGroovyShellSingleton; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.serialization.db.EdgeRule; +import org.onap.aai.serialization.db.EdgeRules; +import org.onap.aai.serialization.db.EdgeType; +import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException; import com.google.common.base.Joiner; diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinTraversal.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java index daf795fd..801ac339 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinTraversal.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.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.query.builder; +package org.onap.aai.query.builder; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -29,11 +30,11 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.query.TraversalStrategy; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.query.TraversalStrategy; /** * The Class GremlinTraversal. diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinUnique.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java index ee2353f1..284f8847 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinUnique.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.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.query.builder; +package org.onap.aai.query.builder; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -30,12 +31,12 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.query.TraversalStrategy; -import org.openecomp.aai.parsers.query.UniqueStrategy; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.query.TraversalStrategy; +import org.onap.aai.parsers.query.UniqueStrategy; /** * The Class GremlinUnique. diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/QueryBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java index 717033fa..3a3feafb 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/QueryBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.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.query.builder; +package org.onap.aai.query.builder; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,13 +32,13 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.query.QueryParserStrategy; -import org.openecomp.aai.serialization.db.EdgeType; -import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.query.QueryParserStrategy; +import org.onap.aai.serialization.db.EdgeType; +import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException; /** * The Class QueryBuilder. diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/TraversalQuery.java b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java index 628e055e..60e72aa5 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/TraversalQuery.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.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.query.builder; +package org.onap.aai.query.builder; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -31,11 +32,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.query.TraversalStrategy; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.query.TraversalStrategy; /** * The Class TraversalQuery. diff --git a/aai-core/src/main/java/org/openecomp/aai/rest/RestTokens.java b/aai-core/src/main/java/org/onap/aai/rest/RestTokens.java index 13bfe650..d6e18027 100644 --- a/aai-core/src/main/java/org/openecomp/aai/rest/RestTokens.java +++ b/aai-core/src/main/java/org/onap/aai/rest/RestTokens.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; public enum RestTokens { diff --git a/aai-core/src/main/java/org/openecomp/aai/rest/db/DBRequest.java b/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java index e7b68588..66edf15e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/rest/db/DBRequest.java +++ b/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.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.db; +package org.onap.aai.rest.db; import java.net.URI; import java.util.Optional; @@ -26,10 +27,10 @@ import java.util.Optional; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.MarshallerProperties; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.restcore.HttpMethod; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.MarshallerProperties; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.restcore.HttpMethod; /** * The Class DBRequest. diff --git a/aai-core/src/main/java/org/openecomp/aai/rest/db/HttpEntry.java b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java index 226e6023..634e44e9 100644 --- a/aai-core/src/main/java/org/openecomp/aai/rest/db/HttpEntry.java +++ b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.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.db; +package org.onap.aai.rest.db; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -42,30 +43,30 @@ import org.apache.commons.lang.StringUtils; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.javatuples.Pair; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.dbmap.DBConnectionType; -import org.openecomp.aai.domain.responseMessage.AAIResponseMessage; -import org.openecomp.aai.domain.responseMessage.AAIResponseMessageDatum; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.MarshallerProperties; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.uri.URIToExtensionInformation; -import org.openecomp.aai.rest.ueb.UEBNotification; -import org.openecomp.aai.restcore.HttpMethod; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.engines.QueryStyle; -import org.openecomp.aai.serialization.engines.TitanDBEngine; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; -import org.openecomp.aai.serialization.engines.query.QueryEngine; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.dbmap.DBConnectionType; +import org.onap.aai.domain.responseMessage.AAIResponseMessage; +import org.onap.aai.domain.responseMessage.AAIResponseMessageDatum; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.introspection.MarshallerProperties; +import org.onap.aai.introspection.ModelInjestor; +import org.onap.aai.introspection.ModelType; +import org.onap.aai.introspection.Version; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.uri.URIToExtensionInformation; +import org.onap.aai.rest.ueb.UEBNotification; +import org.onap.aai.restcore.HttpMethod; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.engines.QueryStyle; +import org.onap.aai.serialization.engines.TitanDBEngine; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.serialization.engines.query.QueryEngine; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -260,7 +261,7 @@ public class HttpEntry { MarshallerProperties properties; if (!request.getMarshallerProperties().isPresent()) { properties = - new MarshallerProperties.Builder(org.openecomp.aai.restcore.MediaType.getEnum(outputMediaType)).build(); + new MarshallerProperties.Builder(org.onap.aai.restcore.MediaType.getEnum(outputMediaType)).build(); } else { properties = request.getMarshallerProperties().get(); } diff --git a/aai-core/src/main/java/org/openecomp/aai/rest/ueb/NotificationEvent.java b/aai-core/src/main/java/org/onap/aai/rest/ueb/NotificationEvent.java index e473e9da..00678fb9 100644 --- a/aai-core/src/main/java/org/openecomp/aai/rest/ueb/NotificationEvent.java +++ b/aai-core/src/main/java/org/onap/aai/rest/ueb/NotificationEvent.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.onap.aai.rest.ueb; -package org.openecomp.aai.rest.ueb; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.util.StoreNotificationEvent; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.Version; +import org.onap.aai.util.StoreNotificationEvent; /** * The Class NotificationEvent. diff --git a/aai-core/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java b/aai-core/src/main/java/org/onap/aai/rest/ueb/UEBNotification.java index fdba3081..1ada5036 100644 --- a/aai-core/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java +++ b/aai-core/src/main/java/org/onap/aai/rest/ueb/UEBNotification.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.ueb; +package org.onap.aai.rest.ueb; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -28,16 +29,16 @@ import java.util.List; import javax.ws.rs.core.Response.Status; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.introspection.exceptions.AAIUnmarshallingException; -import org.openecomp.aai.parsers.uri.URIToObject; -import org.openecomp.aai.util.AAIConfig; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.LoaderFactory; +import org.onap.aai.introspection.Version; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.introspection.exceptions.AAIUnmarshallingException; +import org.onap.aai.parsers.uri.URIToObject; +import org.onap.aai.util.AAIConfig; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/CustomJacksonJaxBJsonProvider.java b/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java index 1748fd62..9072323c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/CustomJacksonJaxBJsonProvider.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.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.restcore; +package org.onap.aai.restcore; import javax.ws.rs.ext.Provider; diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/HttpMethod.java b/aai-core/src/main/java/org/onap/aai/restcore/HttpMethod.java index 3dab68ee..e7c8d215 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/HttpMethod.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/HttpMethod.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.restcore; +package org.onap.aai.restcore; /** * The Enum HttpMethod. diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/JettyObfuscationConversionCommandLineUtil.java b/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java index b2e2d9f8..920a85ae 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/JettyObfuscationConversionCommandLineUtil.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.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.restcore; +package org.onap.aai.restcore; import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/MediaType.java b/aai-core/src/main/java/org/onap/aai/restcore/MediaType.java index c6eb13ec..89be23e5 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/MediaType.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/MediaType.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.restcore; +package org.onap.aai.restcore; /** * The Enum MediaType. diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/RESTAPI.java b/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java index 18aef073..3895f626 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/RESTAPI.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.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.restcore; +package org.onap.aai.restcore; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -30,21 +31,21 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.dbmap.DBConnectionType; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.tools.CreateUUID; -import org.openecomp.aai.introspection.tools.DefaultFields; -import org.openecomp.aai.introspection.tools.InjectKeysFromURI; -import org.openecomp.aai.introspection.tools.IntrospectorValidator; -import org.openecomp.aai.introspection.tools.Issue; -import org.openecomp.aai.introspection.tools.RemoveNonVisibleProperty; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.logging.LoggingContext; -import org.openecomp.aai.util.AAIConfig; -import org.openecomp.aai.util.FormatDate; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.dbmap.DBConnectionType; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.tools.CreateUUID; +import org.onap.aai.introspection.tools.DefaultFields; +import org.onap.aai.introspection.tools.InjectKeysFromURI; +import org.onap.aai.introspection.tools.IntrospectorValidator; +import org.onap.aai.introspection.tools.Issue; +import org.onap.aai.introspection.tools.RemoveNonVisibleProperty; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.logging.LoggingContext; +import org.onap.aai.util.AAIConfig; +import org.onap.aai.util.FormatDate; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/search/GremlinGroovyShellSingleton.java b/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java index b098dcc4..7eb600d2 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/search/GremlinGroovyShellSingleton.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.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.restcore.search; +package org.onap.aai.restcore.search; import java.util.HashMap; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/util/GenerateEdgeRules.java b/aai-core/src/main/java/org/onap/aai/restcore/util/GenerateEdgeRules.java index 082d6151..1b854667 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/util/GenerateEdgeRules.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/util/GenerateEdgeRules.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.restcore.util; +package org.onap.aai.restcore.util; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/restcore/util/URITools.java b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java index 0a91d765..9889a567 100644 --- a/aai-core/src/main/java/org/openecomp/aai/restcore/util/URITools.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.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.restcore.util; +package org.onap.aai.restcore.util; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -36,9 +37,9 @@ import javax.ws.rs.core.MultivaluedMap; import org.springframework.web.util.UriUtils; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; -import org.openecomp.aai.schema.enums.PropertyMetadata; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; +import org.onap.aai.schema.enums.PropertyMetadata; public class URITools { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/AAIDirection.java b/aai-core/src/main/java/org/onap/aai/serialization/db/AAIDirection.java index fe9be364..1dce588d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/AAIDirection.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/AAIDirection.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.db; +package org.onap.aai.serialization.db; public enum AAIDirection { IN, OUT, BOTH, NONE; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/DBSerializer.java b/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java index 09d405a7..dd073dc7 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/DBSerializer.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.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.db; +package org.onap.aai.serialization.db; import com.att.eelf.configuration.EELFLogger; @@ -31,28 +32,28 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; import org.apache.tinkerpop.gremlin.structure.*; import org.javatuples.Pair; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.*; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.introspection.sideeffect.DataCopy; -import org.openecomp.aai.introspection.sideeffect.DataLinkReader; -import org.openecomp.aai.introspection.sideeffect.DataLinkWriter; -import org.openecomp.aai.introspection.sideeffect.SideEffectRunner; -import org.openecomp.aai.logging.ErrorLogHelper; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.uri.URIParser; -import org.openecomp.aai.parsers.uri.URIToRelationshipObject; -import org.openecomp.aai.query.builder.QueryBuilder; -import org.openecomp.aai.schema.enums.ObjectMetadata; -import org.openecomp.aai.schema.enums.PropertyMetadata; -import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; -import org.openecomp.aai.serialization.tinkerpop.TreeBackedVertex; -import org.openecomp.aai.util.AAIApiServerURLBase; -import org.openecomp.aai.util.AAIConfig; -import org.openecomp.aai.util.AAIConstants; -import org.openecomp.aai.workarounds.NamingExceptions; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.*; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.introspection.sideeffect.DataCopy; +import org.onap.aai.introspection.sideeffect.DataLinkReader; +import org.onap.aai.introspection.sideeffect.DataLinkWriter; +import org.onap.aai.introspection.sideeffect.SideEffectRunner; +import org.onap.aai.logging.ErrorLogHelper; +import org.onap.aai.parsers.query.QueryParser; +import org.onap.aai.parsers.uri.URIParser; +import org.onap.aai.parsers.uri.URIToRelationshipObject; +import org.onap.aai.query.builder.QueryBuilder; +import org.onap.aai.schema.enums.ObjectMetadata; +import org.onap.aai.schema.enums.PropertyMetadata; +import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.serialization.tinkerpop.TreeBackedVertex; +import org.onap.aai.util.AAIApiServerURLBase; +import org.onap.aai.util.AAIConfig; +import org.onap.aai.util.AAIConstants; +import org.onap.aai.workarounds.NamingExceptions; import javax.ws.rs.core.UriBuilder; import java.io.UnsupportedEncodingException; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/DeleteSemantic.java b/aai-core/src/main/java/org/onap/aai/serialization/db/DeleteSemantic.java index 5b153c29..a6fe22b8 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/DeleteSemantic.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/DeleteSemantic.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.db; +package org.onap.aai.serialization.db; /** diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperties.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperties.java index 8ce1d1c9..73ece7e4 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperties.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperties.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.db; +package org.onap.aai.serialization.db; public class EdgeProperties { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperty.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperty.java index 21f07451..29d82298 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperty.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperty.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.db; +package org.onap.aai.serialization.db; public enum EdgeProperty { FROM("from"), diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgePropertyMap.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java index bce2c313..92643bcf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgePropertyMap.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.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.db; +package org.onap.aai.serialization.db; import org.apache.tinkerpop.gremlin.structure.Direction; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRule.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRule.java index 1b6c19f0..309dbffe 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRule.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRule.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.db; +package org.onap.aai.serialization.db; import org.apache.tinkerpop.gremlin.structure.Direction; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRules.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRules.java index f819b9ea..d9dfa457 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRules.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRules.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.db; +package org.onap.aai.serialization.db; import static com.jayway.jsonpath.Criteria.where; import static com.jayway.jsonpath.Filter.filter; @@ -39,11 +40,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.serialization.db.exceptions.EdgeMultiplicityException; -import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Version; +import org.onap.aai.serialization.db.exceptions.EdgeMultiplicityException; +import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeType.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeType.java index cf3219fa..088e13bb 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeType.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeType.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.db; +package org.onap.aai.serialization.db; public enum EdgeType { COUSIN, diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/GetAllPool.java b/aai-core/src/main/java/org/onap/aai/serialization/db/GetAllPool.java index 379c3f30..4d38bd38 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/GetAllPool.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/GetAllPool.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.db; +package org.onap.aai.serialization.db; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/GraphSingleton.java b/aai-core/src/main/java/org/onap/aai/serialization/db/GraphSingleton.java index ba616387..9bb04d6b 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/GraphSingleton.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/GraphSingleton.java @@ -1,28 +1,29 @@ -/*- +/** * ============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.db; +package org.onap.aai.serialization.db; import com.thinkaurelius.titan.core.TitanGraph; -import org.openecomp.aai.dbmap.AAIGraph; -import org.openecomp.aai.dbmap.DBConnectionType; +import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.dbmap.DBConnectionType; import java.util.concurrent.atomic.AtomicInteger; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/LegacyDBSerializer.java b/aai-core/src/main/java/org/onap/aai/serialization/db/LegacyDBSerializer.java index 5d419852..b9343816 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/LegacyDBSerializer.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/LegacyDBSerializer.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.onap.aai.serialization.db; -package org.openecomp.aai.serialization.db; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.ModelType; +import org.onap.aai.introspection.Version; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; public class LegacyDBSerializer extends DBSerializer { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/MultiplicityRule.java b/aai-core/src/main/java/org/onap/aai/serialization/db/MultiplicityRule.java index a1c9124d..0451c0d7 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/MultiplicityRule.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/MultiplicityRule.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.db; +package org.onap.aai.serialization.db; public enum MultiplicityRule { MANY2ONE, diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/TitanGraphSingleton.java b/aai-core/src/main/java/org/onap/aai/serialization/db/TitanGraphSingleton.java index 58008dab..e1accb4e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/TitanGraphSingleton.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/TitanGraphSingleton.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.db; +package org.onap.aai.serialization.db; /* This is class is just a wrapper of its parent */ public class TitanGraphSingleton extends GraphSingleton { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/exceptions/EdgeMultiplicityException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java index 081a2d62..6baa113d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/exceptions/EdgeMultiplicityException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.serialization.db.exceptions; -package org.openecomp.aai.serialization.db.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class EdgeMultiplicityException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java index 025dfd82..247379cb 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.serialization.db.exceptions; -package org.openecomp.aai.serialization.db.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class NoEdgeRuleFoundException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/QueryStyle.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/QueryStyle.java index f6fae4d5..db947bf8 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/QueryStyle.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/QueryStyle.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.engines; +package org.onap.aai.serialization.engines; public enum QueryStyle { GREMLIN_TRAVERSAL, GREMLIN_UNIQUE, GREMLINPIPELINE_TRAVERSAL, TRAVERSAL diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TitanDBEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/TitanDBEngine.java index 8611ba6b..315081e7 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TitanDBEngine.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/TitanDBEngine.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.engines; +package org.onap.aai.serialization.engines; import java.util.ArrayList; import java.util.Iterator; @@ -26,9 +27,9 @@ import java.util.List; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import org.openecomp.aai.dbmap.DBConnectionType; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.serialization.db.TitanGraphSingleton; +import org.onap.aai.dbmap.DBConnectionType; +import org.onap.aai.introspection.Loader; +import org.onap.aai.serialization.db.TitanGraphSingleton; public class TitanDBEngine extends TransactionalGraphEngine { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TransactionalGraphEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/TransactionalGraphEngine.java index ef91a868..11bf5955 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TransactionalGraphEngine.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/TransactionalGraphEngine.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.engines; +package org.onap.aai.serialization.engines; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -27,15 +28,15 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.dbmap.DBConnectionType; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.query.builder.GremlinTraversal; -import org.openecomp.aai.query.builder.GremlinUnique; -import org.openecomp.aai.query.builder.QueryBuilder; -import org.openecomp.aai.query.builder.TraversalQuery; -import org.openecomp.aai.serialization.db.GraphSingleton; -import org.openecomp.aai.serialization.engines.query.GraphTraversalQueryEngine; -import org.openecomp.aai.serialization.engines.query.QueryEngine; +import org.onap.aai.dbmap.DBConnectionType; +import org.onap.aai.introspection.Loader; +import org.onap.aai.query.builder.GremlinTraversal; +import org.onap.aai.query.builder.GremlinUnique; +import org.onap.aai.query.builder.QueryBuilder; +import org.onap.aai.query.builder.TraversalQuery; +import org.onap.aai.serialization.db.GraphSingleton; +import org.onap.aai.serialization.engines.query.GraphTraversalQueryEngine; +import org.onap.aai.serialization.engines.query.QueryEngine; import com.thinkaurelius.titan.core.TitanGraph; import com.thinkaurelius.titan.core.schema.TitanManagement; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GraphTraversalQueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java index ac8b21e1..872b0c5f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GraphTraversalQueryEngine.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.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.serialization.engines.query; +package org.onap.aai.serialization.engines.query; -import static org.openecomp.aai.serialization.db.AAIDirection.IN; -import static org.openecomp.aai.serialization.db.AAIDirection.NONE; -import static org.openecomp.aai.serialization.db.AAIDirection.OUT; -import static org.openecomp.aai.serialization.db.EdgeProperty.CONTAINS; -import static org.openecomp.aai.serialization.db.EdgeProperty.DELETE_OTHER_V; +import static org.onap.aai.serialization.db.AAIDirection.IN; +import static org.onap.aai.serialization.db.AAIDirection.NONE; +import static org.onap.aai.serialization.db.AAIDirection.OUT; +import static org.onap.aai.serialization.db.EdgeProperty.CONTAINS; +import static org.onap.aai.serialization.db.EdgeProperty.DELETE_OTHER_V; import java.util.List; import java.util.Set; @@ -39,8 +40,8 @@ import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.Loader; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.Loader; /* * This class needs some big explanation despite its compact size. diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GremlinPipelineQueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinPipelineQueryEngine.java index 809b6d96..e8acaecd 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GremlinPipelineQueryEngine.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinPipelineQueryEngine.java @@ -1,6 +1,27 @@ -package org.openecomp.aai.serialization.engines.query;/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai + * ================================================================================ + * 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 + * + * 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.onap.aai.serialization.engines.query;/*- + * ============LICENSE_START======================================================= + * org.onap.aai * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ @@ -19,15 +40,15 @@ package org.openecomp.aai.serialization.engines.query;/*- */ /* -package org.openecomp.aai.serialization.engines.query; +package org.onap.aai.serialization.engines.query; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.openecomp.aai.db.AAIProperties; -import org.openecomp.aai.query.builder.QueryBuilder; -import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import org.onap.aai.db.AAIProperties; +import org.onap.aai.query.builder.QueryBuilder; +import org.onap.aai.serialization.engines.TransactionalGraphEngine; import com.tinkerpop.blueprints.Direction; import com.tinkerpop.blueprints.TransactionalGraph; import com.tinkerpop.blueprints.Vertex; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GremlinQueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinQueryEngine.java index 1ca02112..ab622963 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/GremlinQueryEngine.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinQueryEngine.java @@ -1,6 +1,27 @@ -package org.openecomp.aai.serialization.engines.query;/*- +/** * ============LICENSE_START======================================================= - * org.openecomp.aai + * org.onap.aai + * ================================================================================ + * 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 + * + * 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.onap.aai.serialization.engines.query;/*- + * ============LICENSE_START======================================================= + * org.onap.aai * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ @@ -19,7 +40,7 @@ package org.openecomp.aai.serialization.engines.query;/*- */ // -//package org.openecomp.aai.serialization.engines.query; +//package org.onap.aai.serialization.engines.query; // //import java.util.List; //import java.util.regex.Matcher; @@ -27,9 +48,9 @@ package org.openecomp.aai.serialization.engines.query;/*- // //import org.apache.commons.collections.IteratorUtils; // -//import org.openecomp.aai.db.AAIProperties; -//import org.openecomp.aai.query.builder.QueryBuilder; -//import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +//import org.onap.aai.db.AAIProperties; +//import org.onap.aai.query.builder.QueryBuilder; +//import org.onap.aai.serialization.engines.TransactionalGraphEngine; //import com.tinkerpop.blueprints.Direction; //import com.tinkerpop.blueprints.Graph; //import com.tinkerpop.blueprints.TransactionalGraph; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/QueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java index 5ac94d6c..01f11b17 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/query/QueryEngine.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.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.engines.query; +package org.onap.aai.serialization.engines.query; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; @@ -26,8 +27,8 @@ import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.Loader; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.Loader; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Console.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Console.java index 561fd6cf..f101f890 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Console.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Console.java @@ -1,27 +1,28 @@ -/*- +/** * ============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 com.google.gson.JsonObject; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; public class Console implements FormatMapper { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Format.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Format.java index 0505f626..2904cce6 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Format.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Format.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; public enum Format { graphson, diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/FormatFactory.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java index 7753ae77..b19e0c3e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/FormatFactory.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java @@ -1,34 +1,35 @@ -/*- +/** * ============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 javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.queryformats.exceptions.QueryParamInjectionException; -import org.openecomp.aai.serialization.queryformats.utils.QueryParamInjector; -import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Loader; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.queryformats.exceptions.QueryParamInjectionException; +import org.onap.aai.serialization.queryformats.utils.QueryParamInjector; +import org.onap.aai.serialization.queryformats.utils.UrlBuilder; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/FormatMapper.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatMapper.java index e9f17c6b..fb822dd9 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/FormatMapper.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatMapper.java @@ -1,27 +1,28 @@ -/*- +/** * ============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 com.google.gson.JsonObject; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; public interface FormatMapper { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Formatter.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java index 26b0411e..50042b76 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Formatter.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.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.serialization.queryformats; +package org.onap.aai.serialization.queryformats; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; import java.util.List; import java.util.Optional; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/GraphSON.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java index 9d119875..00aa781c 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/GraphSON.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.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 com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/IdURL.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java index d0496c65..320cd616 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/IdURL.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java @@ -1,35 +1,36 @@ -/*- +/** * ============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 com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -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.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.utils.UrlBuilder; public class IdURL implements FormatMapper { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/PathedURL.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java index 09383c9a..8b9d5058 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/PathedURL.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java @@ -1,35 +1,36 @@ -/*- +/** * ============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 com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -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.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.utils.UrlBuilder; public final class PathedURL implements FormatMapper { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/RawFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/RawFormat.java index 070e22f4..7aaf3035 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/RawFormat.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/RawFormat.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 java.util.Iterator; import java.util.List; @@ -26,13 +27,13 @@ import java.util.List; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; -import org.openecomp.aai.serialization.queryformats.params.Depth; -import org.openecomp.aai.serialization.queryformats.params.NodesOnly; -import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.introspection.Loader; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.params.Depth; +import org.onap.aai.serialization.queryformats.params.NodesOnly; +import org.onap.aai.serialization.queryformats.utils.UrlBuilder; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Resource.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java index 9a090a4b..649971be 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/Resource.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java @@ -1,40 +1,41 @@ -/*- +/** * ============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 java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; -import org.openecomp.aai.serialization.queryformats.params.Depth; -import org.openecomp.aai.serialization.queryformats.params.NodesOnly; -import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.serialization.queryformats.params.Depth; +import org.onap.aai.serialization.queryformats.params.NodesOnly; +import org.onap.aai.serialization.queryformats.utils.UrlBuilder; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/SimpleFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java index f3a2990c..ba49e3a3 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/SimpleFormat.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java @@ -1,35 +1,36 @@ -/*- +/** * ============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 java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.db.props.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.db.props.AAIProperties; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; import com.google.gson.JsonObject; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/SubGraphStyle.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SubGraphStyle.java index 15c5041d..6a8acd2f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/SubGraphStyle.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SubGraphStyle.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; public enum SubGraphStyle { star, diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java index dc2b8a71..98b90050 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.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.exceptions; +package org.onap.aai.serialization.queryformats.exceptions; public class AAIFormatVertexException extends Exception { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java index 6f75e3ba..313b8942 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.serialization.queryformats.exceptions; -package org.openecomp.aai.serialization.queryformats.exceptions; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class QueryParamInjectionException extends AAIException { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Depth.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Depth.java index d5ade869..e98f0667 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Depth.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Depth.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.params; +package org.onap.aai.serialization.queryformats.params; @Inject(name = "depth") public interface Depth<T> { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Inject.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Inject.java index 128b7394..18d85545 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Inject.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Inject.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.params; +package org.onap.aai.serialization.queryformats.params; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/NodesOnly.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/NodesOnly.java index e81b5447..1429d552 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/NodesOnly.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/NodesOnly.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.params; +package org.onap.aai.serialization.queryformats.params; @Inject(name = "nodesOnly") public interface NodesOnly<T> { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Setter.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Setter.java index ad866c22..e95de0db 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/params/Setter.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Setter.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.params; +package org.onap.aai.serialization.queryformats.params; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjector.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java index 725152dd..29fb56df 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjector.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.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.utils; +package org.onap.aai.serialization.queryformats.utils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -26,9 +27,9 @@ import java.util.Set; import javax.ws.rs.core.MultivaluedMap; -import org.openecomp.aai.serialization.queryformats.exceptions.QueryParamInjectionException; -import org.openecomp.aai.serialization.queryformats.params.Inject; -import org.openecomp.aai.serialization.queryformats.params.Setter; +import org.onap.aai.serialization.queryformats.exceptions.QueryParamInjectionException; +import org.onap.aai.serialization.queryformats.params.Inject; +import org.onap.aai.serialization.queryformats.params.Setter; import org.reflections.Reflections; public class QueryParamInjector { @@ -37,7 +38,7 @@ public class QueryParamInjector { private QueryParamInjector () { - Reflections reflections = new Reflections("org.openecomp.aai.serialization.queryformats.params"); + Reflections reflections = new Reflections("org.onap.aai.serialization.queryformats.params"); results = reflections.getTypesAnnotatedWith(Inject.class); } diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java index 5579c8a6..8387285d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java @@ -1,37 +1,38 @@ -/*- +/** * ============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.utils; +package org.onap.aai.serialization.queryformats.utils; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.serialization.db.DBSerializer; -import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; -import org.openecomp.aai.util.AAIApiServerURLBase; -import org.openecomp.aai.util.AAIConstants; -import org.openecomp.aai.workarounds.LegacyURITransformer; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Version; +import org.onap.aai.serialization.db.DBSerializer; +import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException; +import org.onap.aai.util.AAIApiServerURLBase; +import org.onap.aai.util.AAIConstants; +import org.onap.aai.workarounds.LegacyURITransformer; public class UrlBuilder { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedEdge.java b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java index 774ab28f..82aa7443 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedEdge.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.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.tinkerpop; +package org.onap.aai.serialization.tinkerpop; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertex.java b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java index 7ebad216..e953dc2d 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertex.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.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.tinkerpop; +package org.onap.aai.serialization.tinkerpop; import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; import org.apache.tinkerpop.gremlin.structure.*; diff --git a/aai-core/src/main/java/org/openecomp/aai/tasks/ScheduledTasks.java b/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java index f0a4d41a..9d2e8b68 100644 --- a/aai-core/src/main/java/org/openecomp/aai/tasks/ScheduledTasks.java +++ b/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.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.tasks; +package org.onap.aai.tasks; import java.io.File; import java.util.Arrays; @@ -30,9 +31,9 @@ import org.apache.commons.io.comparator.LastModifiedFileComparator; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.openecomp.aai.logging.LoggingContext; -import org.openecomp.aai.util.AAIConfig; -import org.openecomp.aai.util.AAIConstants; +import org.onap.aai.logging.LoggingContext; +import org.onap.aai.util.AAIConfig; +import org.onap.aai.util.AAIConstants; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIApiServerURLBase.java b/aai-core/src/main/java/org/onap/aai/util/AAIApiServerURLBase.java index 12a2c06d..45f671ef 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIApiServerURLBase.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIApiServerURLBase.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.util.List; import java.util.Map; @@ -27,8 +28,8 @@ import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Version; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Version; public class AAIApiServerURLBase { diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIApiVersion.java b/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java index 680fcf63..042fd177 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIApiVersion.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.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.util.regex.Matcher; import java.util.regex.Pattern; @@ -26,7 +27,7 @@ import java.util.regex.Pattern; import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class AAIApiVersion { diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAICSVWriter.java b/aai-core/src/main/java/org/onap/aai/util/AAICSVWriter.java index 5467168c..c091fc24 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAICSVWriter.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAICSVWriter.java @@ -1,27 +1,28 @@ -/*- +/** * ============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.IOException; import java.io.PrintWriter; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIConfig.java b/aai-core/src/main/java/org/onap/aai/util/AAIConfig.java index 9fcb521d..445fa0dd 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIConfig.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIConfig.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.FileInputStream; import java.io.FileNotFoundException; @@ -32,8 +33,8 @@ import java.util.Timer; import org.eclipse.jetty.util.security.Password; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.logging.ErrorLogHelper; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.logging.ErrorLogHelper; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIConfigCommandLinePropGetter.java b/aai-core/src/main/java/org/onap/aai/util/AAIConfigCommandLinePropGetter.java index c6ddc4fd..9c301871 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIConfigCommandLinePropGetter.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIConfigCommandLinePropGetter.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.util; -package org.openecomp.aai.util; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; /* * The script deobfuscatePW.sh needs to retrieve pws from the AAIConfig file. diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java b/aai-core/src/main/java/org/onap/aai/util/AAIConstants.java index 6c23c6e3..9b7afe52 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIConstants.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.util; -package org.openecomp.aai.util; - -import org.openecomp.aai.db.props.AAIProperties; +import org.onap.aai.db.props.AAIProperties; public final class AAIConstants { diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIMechIdConfig.java b/aai-core/src/main/java/org/onap/aai/util/AAIMechIdConfig.java index 54331f4e..04d0774b 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIMechIdConfig.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIMechIdConfig.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.FileNotFoundException; @@ -31,7 +32,7 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; -import org.openecomp.aai.logging.ErrorLogHelper; +import org.onap.aai.logging.ErrorLogHelper; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIRSyncUtility.java b/aai-core/src/main/java/org/onap/aai/util/AAIRSyncUtility.java index 9c93d5ef..f20346eb 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIRSyncUtility.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIRSyncUtility.java @@ -1,27 +1,28 @@ -/*- +/** * ============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.BufferedReader; import java.io.InputStreamReader; @@ -31,7 +32,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/Entity.java b/aai-core/src/main/java/org/onap/aai/util/Entity.java index c1324043..b672ffb2 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/Entity.java +++ b/aai-core/src/main/java/org/onap/aai/util/Entity.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.util.ArrayList; import java.util.HashMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/EntityList.java b/aai-core/src/main/java/org/onap/aai/util/EntityList.java index 6bf06054..fb91795a 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/EntityList.java +++ b/aai-core/src/main/java/org/onap/aai/util/EntityList.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.util.ArrayList; import java.util.HashMap; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/FileWatcher.java b/aai-core/src/main/java/org/onap/aai/util/FileWatcher.java index 84e7a1a3..55d0123f 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/FileWatcher.java +++ b/aai-core/src/main/java/org/onap/aai/util/FileWatcher.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.util.*; import java.io.*; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/FormatDate.java b/aai-core/src/main/java/org/onap/aai/util/FormatDate.java index d1489992..bf44dd19 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/FormatDate.java +++ b/aai-core/src/main/java/org/onap/aai/util/FormatDate.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.time.ZoneId; import java.time.ZonedDateTime; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java index 15ea8a32..c9405264 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java +++ b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.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.util; +package org.onap.aai.util; import com.google.common.base.Joiner; import com.jayway.jsonpath.JsonPath; -import org.openecomp.aai.introspection.Version; -import org.openecomp.aai.serialization.db.EdgeProperty; +import org.onap.aai.introspection.Version; +import org.onap.aai.serialization.db.EdgeProperty; import org.w3c.dom.*; import javax.xml.XMLConstants; @@ -581,7 +582,7 @@ public class GenerateXsd { } sb1.append( indentation + " <xs:appinfo>\r\n" + - indentation + " <annox:annotate target=\""+target+"\">@org.openecomp.aai.annotations.Metadata(" + Joiner.on(",").join(metadata) + ")</annox:annotate>\r\n" + + indentation + " <annox:annotate target=\""+target+"\">@org.onap.aai.annotations.Metadata(" + Joiner.on(",").join(metadata) + ")</annox:annotate>\r\n" + indentation + " </xs:appinfo>\r\n"); } diff --git a/aai-core/src/main/java/org/openecomp/aai/util/HbaseSaltPrefixer.java b/aai-core/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java index ba1575c4..792f7d52 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/HbaseSaltPrefixer.java +++ b/aai-core/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.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; /* * logging to hbase encountered hotspotting issues, so per diff --git a/aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java index 664620e2..24ba1ba8 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java +++ b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.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.FileInputStream; import java.security.KeyManagementException; @@ -79,7 +80,7 @@ public class HttpsAuthClient{ ClientConfig config = new DefaultClientConfig(); config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE); - config.getClasses().add(org.openecomp.aai.restcore.CustomJacksonJaxBJsonProvider.class); + config.getClasses().add(org.onap.aai.restcore.CustomJacksonJaxBJsonProvider.class); SSLContext ctx = null; try { diff --git a/aai-core/src/main/java/org/openecomp/aai/util/KeyValueList.java b/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java index 9628f99b..12672b3b 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/KeyValueList.java +++ b/aai-core/src/main/java/org/onap/aai/util/KeyValueList.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.util.HashMap; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/MapperUtil.java b/aai-core/src/main/java/org/onap/aai/util/MapperUtil.java index 0579964d..9633fdaf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/MapperUtil.java +++ b/aai-core/src/main/java/org/onap/aai/util/MapperUtil.java @@ -1,26 +1,27 @@ -/*- +/** * ============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.onap.aai.util; -package org.openecomp.aai.util; - -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/PojoUtils.java b/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java index 8840f412..5a84d9d0 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/PojoUtils.java +++ b/aai-core/src/main/java/org/onap/aai/util/PojoUtils.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.IOException; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/Request.java b/aai-core/src/main/java/org/onap/aai/util/Request.java index 327fab74..605aa2b9 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/Request.java +++ b/aai-core/src/main/java/org/onap/aai/util/Request.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.UnsupportedEncodingException; import java.net.URI; @@ -28,7 +29,7 @@ import java.nio.charset.StandardCharsets; import javax.ws.rs.core.UriBuilder; -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; public class Request<T> { diff --git a/aai-core/src/main/java/org/openecomp/aai/util/RestObject.java b/aai-core/src/main/java/org/onap/aai/util/RestObject.java index a1cc2a14..0b267d43 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/RestObject.java +++ b/aai-core/src/main/java/org/onap/aai/util/RestObject.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; public class RestObject<T> { diff --git a/aai-core/src/main/java/org/openecomp/aai/util/RestURLEncoder.java b/aai-core/src/main/java/org/onap/aai/util/RestURLEncoder.java index 46a1f48e..0b97c66e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/RestURLEncoder.java +++ b/aai-core/src/main/java/org/onap/aai/util/RestURLEncoder.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.UnsupportedEncodingException; import org.springframework.web.util.UriUtils; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java b/aai-core/src/main/java/org/onap/aai/util/StoreNotificationEvent.java index 29fa69dc..96dbfeb4 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java +++ b/aai-core/src/main/java/org/onap/aai/util/StoreNotificationEvent.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.StringWriter; import java.util.Iterator; @@ -30,12 +31,12 @@ import org.eclipse.persistence.dynamic.DynamicEntity; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.json.JSONException; import org.json.JSONObject; -import org.openecomp.aai.dmaap.AAIDmaapEventJMSProducer; -import org.openecomp.aai.domain.notificationEvent.NotificationEvent; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; +import org.onap.aai.dmaap.AAIDmaapEventJMSProducer; +import org.onap.aai.domain.notificationEvent.NotificationEvent; +import org.onap.aai.exceptions.AAIException; +import org.onap.aai.introspection.Introspector; +import org.onap.aai.introspection.Loader; +import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; public class StoreNotificationEvent { @@ -69,9 +70,9 @@ public class StoreNotificationEvent { throw new AAIException("AAI_7350"); } - org.openecomp.aai.domain.notificationEvent.ObjectFactory factory = new org.openecomp.aai.domain.notificationEvent.ObjectFactory(); + org.onap.aai.domain.notificationEvent.ObjectFactory factory = new org.onap.aai.domain.notificationEvent.ObjectFactory(); - org.openecomp.aai.domain.notificationEvent.NotificationEvent ne = factory.createNotificationEvent(); + org.onap.aai.domain.notificationEvent.NotificationEvent ne = factory.createNotificationEvent(); if (eh.getId() == null) { eh.setId(genDate2() + "-" + UUID.randomUUID().toString()); diff --git a/aai-core/src/main/java/org/openecomp/aai/util/UniquePropertyCheck.java b/aai-core/src/main/java/org/onap/aai/util/UniquePropertyCheck.java index a2b77506..ae2cdaae 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/UniquePropertyCheck.java +++ b/aai-core/src/main/java/org/onap/aai/util/UniquePropertyCheck.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.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -30,7 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import org.openecomp.aai.exceptions.AAIException; +import org.onap.aai.exceptions.AAIException; import org.slf4j.MDC; import com.att.eelf.configuration.Configuration; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/swagger/Api.java b/aai-core/src/main/java/org/onap/aai/util/swagger/Api.java index 241be43a..e1e16c25 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/swagger/Api.java +++ b/aai-core/src/main/java/org/onap/aai/util/swagger/Api.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.swagger; +package org.onap.aai.util.swagger; import java.util.List; import java.util.Map; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/swagger/Definition.java b/aai-core/src/main/java/org/onap/aai/util/swagger/Definition.java index 31c38c56..9c8f0784 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/swagger/Definition.java +++ b/aai-core/src/main/java/org/onap/aai/util/swagger/Definition.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.swagger; +package org.onap.aai.util.swagger; import java.util.List; diff --git a/aai-core/src/main/java/org/openecomp/aai/util/swagger/GenerateSwagger.java b/aai-core/src/main/java/org/onap/aai/util/swagger/GenerateSwagger.java index 5731485e..a85b548e 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/swagger/GenerateSwagger.java +++ b/aai-core/src/main/java/org/onap/aai/util/swagger/GenerateSwagger.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.swagger; +package org.onap.aai.util.swagger; import com.fasterxml.jackson.dataformat.yaml.snakeyaml.Yaml; import com.fasterxml.jackson.dataformat.yaml.snakeyaml.constructor.SafeConstructor; diff --git a/aai-core/src/main/java/org/openecomp/aai/workarounds/LegacyURITransformer.java b/aai-core/src/main/java/org/onap/aai/workarounds/LegacyURITransformer.java index f79bae60..aabad328 100644 --- a/aai-core/src/main/java/org/openecomp/aai/workarounds/LegacyURITransformer.java +++ b/aai-core/src/main/java/org/onap/aai/workarounds/LegacyURITransformer.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.workarounds; +package org.onap.aai.workarounds; import java.net.MalformedURLException; import java.net.URI; diff --git a/aai-core/src/main/java/org/openecomp/aai/workarounds/NamingExceptions.java b/aai-core/src/main/java/org/onap/aai/workarounds/NamingExceptions.java index 7ce063ed..e2be0d77 100644 --- a/aai-core/src/main/java/org/openecomp/aai/workarounds/NamingExceptions.java +++ b/aai-core/src/main/java/org/onap/aai/workarounds/NamingExceptions.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.workarounds; +package org.onap.aai.workarounds; public class NamingExceptions { diff --git a/aai-core/src/main/java/org/openecomp/aai/workarounds/RemoveDME2QueryParams.java b/aai-core/src/main/java/org/onap/aai/workarounds/RemoveDME2QueryParams.java index b829639b..1116ed5b 100644 --- a/aai-core/src/main/java/org/openecomp/aai/workarounds/RemoveDME2QueryParams.java +++ b/aai-core/src/main/java/org/onap/aai/workarounds/RemoveDME2QueryParams.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.workarounds; +package org.onap.aai.workarounds; import javax.ws.rs.core.MultivaluedMap; diff --git a/aai-core/src/main/resources/EdgeRules.ftl b/aai-core/src/main/resources/EdgeRules.ftl index 837f9377..b29cd314 100644 --- a/aai-core/src/main/resources/EdgeRules.ftl +++ b/aai-core/src/main/resources/EdgeRules.ftl @@ -1,23 +1,26 @@ <#-- - ============LICENSE_START======================================================= - org.openecomp.aai - ================================================================================ - Copyright (C) 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 - - 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========================================================= ---> + ============LICENSE_START======================================================= + org.onap.aai + ================================================================================ + 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 + + 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. + +--> public static final Multimap<String, String> EdgeRules = new ImmutableSetMultimap.Builder<String, String>() <#list edgeRules as edgeRule> .putAll("${edgeRule["nodes"]}", diff --git a/aai-core/src/main/resources/swagger.html.ftl b/aai-core/src/main/resources/swagger.html.ftl index 0506783f..64bd3a45 100644 --- a/aai-core/src/main/resources/swagger.html.ftl +++ b/aai-core/src/main/resources/swagger.html.ftl @@ -1,23 +1,26 @@ <#-- - ============LICENSE_START======================================================= - org.openecomp.aai - ================================================================================ - Copyright (C) 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 - - 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========================================================= ---> + ============LICENSE_START======================================================= + org.onap.aai + ================================================================================ + 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 + + 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. + +--> <!DOCTYPE html> <html> <head> |