Merge branch 'egeria-release-1.7' of https://github.com/odpi/egeria i…

…nto issue2923d

.azure-pipelines/merge.yml

@@ -29,6 +29,7 @@ stages:
             # TODO: Not sure if this is really needed...
           - script: mkdir -p ${HOME}/.docker
           - task: DownloadSecureFile@1
+            displayName: 'Download docker config'
             name: dockerConfig
             inputs:
               secureFile: odpi-docker.json
@@ -38,9 +39,10 @@ stages:
             inputs:
               command: login
               containerRegistry: odpi-dockerhub
-            # Normal build for master - note we have the '-Ddocker.taglatest' set
-            # This can likely be refactored using variables. 
+              # Normal build for master - note we have the '-Ddocker.taglatest' set
+              # and we use ArtifactoryMaven - so that the artifacts are published
           - task: ArtifactoryMaven@1
+            displayName: 'Build to artifactory (for master)'
             condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
             inputs:
               mavenPomFile: 'pom.xml'
@@ -72,42 +74,39 @@ stages:
                   -Ddocker.images=core
                   -Ddockerfile.googleContainerRegistryEnabled=false
             # build for other releases - note we DO NOT have the '-Ddocker.taglatest' set
-          - task: ArtifactoryMaven@1
+            # and we just do a simple maven build as we don't want the artifacts published
+            # Just docker images & to act as build verification
+          - task: Maven@3
+            displayName: 'Build locally with docker (non-master)'
             condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master'))
             inputs:
               mavenPomFile: 'pom.xml'
               javaHomeOption: 'JDKVersion'
               jdkVersionOption: '1.8'
               jdkArchitectureOption: 'x64'
-              artifactoryResolverService: 'ODPiArtifactory'
-              targetResolveReleaseRepo: 'egeria-staging'
-              targetResolveSnapshotRepo: 'egeria-snapshot'
-              artifactoryDeployService: 'ODPiArtifactory'
-              targetDeployReleaseRepo: 'egeria-staging'
-              targetDeploySnapshotRepo: 'egeria-snapshot'
-              collectBuildInfo: true
-              buildName: 'Egeria'
-              buildNumber: '$(Build.BuildNumber)'
-              includeEnvVars: true
-              goals: 'clean install'
+              goals: 'clean deploy'
               options: >-
                   --batch-mode
                   -e
                   -s .m2/settings.xml
-                  -Dmerge
+                  -DaltDeploymentRepository=staging::default::file:$(Agent.BuildDirectory)/local-repo
                   -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-                  -P artifactory
                   -Ddocker
                   -Ddocker.repo=odpi
                   -Ddocker.registry=docker.io
                   -Ddocker.images=core
                   -Ddockerfile.googleContainerRegistryEnabled=false
             # Only publish to artifactory if we are running a master build
           - task: ArtifactoryPublishBuildInfo@1
+            displayName: 'Publish artifactory build (master)'
             condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
             inputs:
               artifactoryService: ODPiArtifactory
               buildName: 'Egeria'
           - publish: target
             artifact: target-$(Build.BuildNumber)
             condition: always()
+            # Take this extra step for non-master builds and publish artifact to pipelines
+          - publish: $(Agent.BuildDirectory)/local-repo
+            condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master'))
+            artifact: org.odpi.egeira-$(Build.BuildNumber)_Java-$(JAVA_VERSION)

open-metadata-implementation/access-services/asset-owner/asset-owner-server/src/main/java/org/odpi/openmetadata/accessservices/assetowner/handlers/FileSystemHandler.java

@@ -138,10 +138,7 @@ private List<String> getFolderNames(String pathName)
                 {
                     result = new ArrayList<>();
 
-                    for (int i=startingToken; i<endingToken; i++)
-                    {
-                        result.add(tokens[i]);
-                    }
+                    result.addAll(Arrays.asList(tokens).subList(startingToken, endingToken));
                 }
             }
         }
@@ -1267,8 +1264,8 @@ public List<String>  addCSVFileToCatalog(String       userId,
         }
 
         Map<String, Object> extendedProperties = new HashMap<>();
-        extendedProperties.put(AssetMapper.DELIMITER_CHARACTER_PROPERTY_NAME, delimiterCharacter);
-        extendedProperties.put(AssetMapper.QUOTE_CHARACTER_PROPERTY_NAME, quoteCharacter);
+        extendedProperties.put(AssetMapper.DELIMITER_CHARACTER_PROPERTY_NAME, delimiterCharacter.toString());
+        extendedProperties.put(AssetMapper.QUOTE_CHARACTER_PROPERTY_NAME, quoteCharacter.toString());
         extendedProperties.put(AssetMapper.FILE_TYPE_PROPERTY_NAME, fileType);
         asset.setExtendedProperties(extendedProperties);
 

open-metadata-implementation/repository-services/repository-services-implementation/src/main/java/org/odpi/openmetadata/repositoryservices/localrepository/repositorycontentmanager/OMRSRepositoryContentValidator.java

@@ -1857,7 +1857,8 @@ public  void validatePropertiesForType(String             sourceName,
             }
 
             boolean  validPropertyType = false;
-            String   validPropertyTypeName = propertyType.getName();
+            String   actualPropertyTypeName = propertyType.getName();
+            String   validPropertyTypeName  = propertyDefinitionType.getName();
 
             switch (propertyType)
             {
@@ -1867,18 +1868,22 @@ public  void validatePropertiesForType(String             sourceName,
                         /*
                          * Ensure that primitive definition category is a perfect match...
                          */
-                        PrimitivePropertyValue primPropertyValue = (PrimitivePropertyValue)propertyValue;
-                        PrimitiveDefCategory propertyDefCat = primPropertyValue.getPrimitiveDefCategory();
-                        PrimitiveDef primAttributeDef = (PrimitiveDef) attributeTypeDef;
-                        PrimitiveDefCategory attributeDefCat = primAttributeDef.getPrimitiveDefCategory();
-                        if (propertyDefCat == attributeDefCat) {
+                        PrimitivePropertyValue primPropertyValue    = (PrimitivePropertyValue)propertyValue;
+                        PrimitiveDefCategory   primPropertyCategory = primPropertyValue.getPrimitiveDefCategory();
+                        PrimitiveDef           expectedAttributeDef = (PrimitiveDef) attributeTypeDef;
+                        PrimitiveDefCategory   expectedAttributeDefCategory = expectedAttributeDef.getPrimitiveDefCategory();
+                        if (primPropertyCategory == expectedAttributeDefCategory)
+                        {
                             validPropertyType = true;
                         }
-                        else {
-                            validPropertyTypeName = attributeDefCat.getName();
+                        else
+                        {
+                            actualPropertyTypeName = primPropertyCategory.getName();
+                            validPropertyTypeName  = expectedAttributeDefCategory.getName();
                         }
                     }
-                    else if (propertyDefinitionType == AttributeTypeDefCategory.UNKNOWN_DEF) {
+                    else if (propertyDefinitionType == AttributeTypeDefCategory.UNKNOWN_DEF)
+                    {
                         /*
                          * This property definition type may have been adopted above due to the
                          * attributeTypeDef being null. Permit primitive definition category to
@@ -1910,7 +1915,7 @@ else if (propertyDefinitionType == AttributeTypeDefCategory.UNKNOWN_DEF) {
             if (! validPropertyType)
             {
                 throw new PropertyErrorException(OMRSErrorCode.BAD_PROPERTY_TYPE.getMessageDefinition(propertyName,
-                                                                                                      propertyType.getName(),
+                                                                                                      actualPropertyTypeName,
                                                                                                       typeDefCategoryName,
                                                                                                       typeDefName,
                                                                                                       validPropertyTypeName,

release-notes/README.md

@@ -3,106 +3,7 @@
 
 # ODPi Egeria Release Notes
 
-Below are the official releases of ODPi Egeria.  The project aims to
-produce a new release about once a month.  Each release includes
-new features and fixes to existing function.  The team aims to
-provide complete backward compatibility from release to release.
-If this is not possible, it will be called out explicitly in the
-release notes with an explanation on how to upgrade.
-Each release will also upgrade the level of its dependencies to
-ensure Egeria is running with all of the latest security patches.
-We therefore recommend that you keep moving forward with us to
-get the best Egeria experience possible.
-To understand more about what it means to have released function see
-[Egeria Content Status](../open-metadata-publication/website/content-status)
-
-One way you can help us is to feedback on your experiences, both good
-and bad.  We would love to hear from you.
-
-## Latest Release
-
-Below are the release notes for the latest ODPi Egeria release:
-
-* [Release 1.6](release-notes-1-6.md) - March 2020
-
-    * Audit Log Framework (ALF) technical preview
-    * Repository Explorer (TEX) 
-
-## Older Releases
-
-* [Release 1.5 (February 2020)](release-notes-1-5.md) 
-    * Metadata de-duplication identification and notification
-    * Data Engine OMAS Technical Preview
-    * Data Engine Proxy Server Technical Preview
-
-* [Release 1.4 (January 2020)](release-notes-1-4.md) 
-    * Bug fixes, documentation
-
-* [Release 1.3 (December 2019)](release-notes-1-3.md)
-    * Conformance test suite improvements
-    * Open Metadata Archives
-
-* [Release 1.2 (November 2019)](release-notes-1-2.md)
-    * Conformance test suite
-    * Asset cataloging and consumption
-    * Governance zones and metadata security
-    * Open metadata archives
-
-* [Release 1.1 (October 2019)](release-notes-1-1.md)
-    * Multi-tenant OMAG Server Platform
-    * JanusGraph based metadata repository
-
-* [Release 1.0 (February 2019)](release-notes-1-0.md)
-    * Peer-to-peer metadata exchange
-
-
-## Future Releases
-
-Our master branch is currently taking code for all future releases.
-Many of the features are large and the teams integrate code for
-partial function as soon as it is stable and has no impact on released function.
-So you will see support for much more function than is officially released.
-This way you can monitor and feedback on future items as they are developed.
-
-The draft release notes for our future planned releases are below:
-
-* [Release 1.7](release-notes-1-7.md) - Planned April 2020
-    * Automated metadata discovery and stewardship
-    * PostgreSQL data connector technical preview
-    * Data quality management
-
-
-* [Release 1.8](release-notes-1-8.md) - Planned May 2020
-    * IT Infrastructure cataloging maintained through DevOps pipelines
-    * API development support
-
-* [Release 1.9](release-notes-1-9.md) - Planned June 2020
-    * Data Science and AI model governance
-    * Ethics governance
-
- * [Release 1.10](release-notes-1-10.md) - Planned July 2020
-    * Governance and Privacy Programs
-    * Licenses, certification, terms and conditions governance
-
-* [Release 1.11](release-notes-1-11.md) - Planned August 2020
-    * Metadata Controlled Security
-    * Data Virtualization Configuration
-
-* [Release 1.12](release-notes-1-12.md) - Planned September 2020
-    * Digital Architecture
-    * Digital service lifecycle management
-
-* [Release 1.13](release-notes-1-13.md) - Planned November 2020
-    * Project management of IT change
-    * IoT and large scale cohorts
-
-
-## Reporting issues
-
-If you discover an issue in the release you are using, we recommend
-first upgrading to the latest available release.  If this does not
-resolve the problem, please raise a new
-[git issue](https://github.com/odpi/egeria).
+Follow [this link](https://egeria.odpi.org/release-notes/) to read the release notes for all releases.
 
 
 ----