Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 7bee27b
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Jun 3 17:25:20 2021 +0200

    fixed bugs in merge and suggestions

commit 7f59ce5
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Jun 3 15:41:47 2021 +0200

    from field for grscicoll emails + error handling improved in country scopes

commit b8e5a42
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Jun 3 13:18:12 2021 +0200

    suggestion emails improvements + #334

commit 23224ed
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed Jun 2 16:37:44 2021 +0200

    fixed tests

commit a3c66b9
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed Jun 2 16:18:30 2021 +0200

    fixed tests

commit 33acef4
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed Jun 2 14:31:39 2021 +0200

    tests + adapted AuthPreCheckCreationRequestFilter

commit 10bc0f1
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 15:45:44 2021 +0200

    fixed tests

commit fb1deb5
Merge: e362d27 95c9cc7
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 15:25:59 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit 95c9cc7
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 14:31:00 2021 +0200

    SuggestedChangesTypeHandler null handling for change authors

commit e362d27
Merge: f82c141 be9551c
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 13:44:10 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit be9551c
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 13:41:03 2021 +0200

    change field stillRelevant renamed to outdated

commit f82c141
Merge: 0d9b1cb 3213a6e
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 13:11:10 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit 3213a6e
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 13:09:37 2021 +0200

    added name, country and changes for CREATE suggestions + urls emails

commit 0d9b1cb
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 12:32:21 2021 +0200

    permissions WIP

commit 8816a36
Merge: 6b98a92 e81d948
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 09:45:17 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

    # Conflicts:
    #	registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java

commit e81d948
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 09:39:00 2021 +0200

    change suggestions improvements

commit c29f8ad
Merge: c008bdb cdb1358
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Jun 1 09:38:19 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	pom.xml

commit 6b98a92
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Mon May 31 12:11:51 2021 +0200

    permissions WIP

commit 4e88724
Merge: 8b2a948 c008bdb
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 28 16:23:26 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit c008bdb
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 28 16:16:24 2021 +0200

    removed country and name from the suggestions DB table

commit 8b2a948
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 28 15:50:09 2021 +0200

    changed condition in DuplicatesService to use IH machine tags

commit a8ffa9d
Merge: c0655e2 f6eac0b
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 28 14:01:26 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit f6eac0b
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 28 13:58:11 2021 +0200

    updated gbif-api version

commit f7eeb47
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 28 13:53:16 2021 +0200

    added entityName and renamed country to entityCountry

commit c0655e2
Merge: 62dfcf2 bbf751f
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 16:11:08 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit bbf751f
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 16:04:36 2021 +0200

    NullToNotFound in suggestions

commit 3275893
Merge: 7435dbc 266b4b5
Author: fmendezh <federicomh@gmail.com>
Date:   Thu May 27 15:45:44 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 7435dbc
Merge: 500f2e2 c2d18fa
Author: fmendezh <federicomh@gmail.com>
Date:   Thu May 27 14:58:06 2021 +0200

    Merge branch '#343_suggest_change_and_log' of https://github.com/gbif/registry into #343_suggest_change_and_log

commit 500f2e2
Merge: 4d786c3 34521cc
Author: fmendezh <federicomh@gmail.com>
Date:   Thu May 27 14:57:59 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit c2d18fa
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 14:55:30 2021 +0200

    get changeSuggestion

commit f3794af
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 14:32:57 2021 +0200

    hiding proposer email for users without rights to edit

commit 4d786c3
Merge: 59a6290 00df497
Author: fmendezh <federicomh@gmail.com>
Date:   Thu May 27 14:20:57 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 62dfcf2
Merge: d7bd774 59a6290
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 12:54:18 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit 59a6290
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 12:49:03 2021 +0200

    ignorning the field deleted in the suggestions

commit 60f5e5f
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 12:38:42 2021 +0200

    fixed changeSuggestion get

commit 798aa81
Merge: 9504251 019e311
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 12:32:17 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/BaseCollectionEntityIT.java
    #	registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java
    #	registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java

commit d7bd774
Merge: e614777 9504251
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 10:53:16 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit 9504251
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 10:49:22 2021 +0200

    updated gbif-api version

commit a9b9611
Merge: 1a9af98 b84da3d
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 10:46:59 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	pom.xml

commit 1a9af98
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 27 10:46:28 2021 +0200

    updated gbif-api version

commit e614777
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 26 17:14:35 2021 +0200

    added namespace and country rights

commit 8fb60c9
Merge: 850a030 d048163
Author: fmendezh <federicomh@gmail.com>
Date:   Wed May 26 14:35:31 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 046d03e
Merge: 22884cd 850a030
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 26 13:51:26 2021 +0200

    Merge branch '#343_suggest_change_and_log' into #341_grscicoll_permissions

commit 850a030
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 26 13:49:00 2021 +0200

    checks before deleting subentities

commit ff97cf0
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 26 09:56:14 2021 +0200

    Fix ITs

commit 22884cd
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 26 09:56:14 2021 +0200

    Fix ITs

commit e2c80d6
Merge: 3d7938d 846dcce
Author: fmendezh <federicomh@gmail.com>
Date:   Wed May 26 08:48:52 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 3d7938d
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 25 15:37:39 2021 +0200

    #342 changes to use IH machine tags instead of identifiers

commit 244bd3f
Merge: be609ea 5da1175
Author: fmendezh <federicomh@gmail.com>
Date:   Tue May 25 15:00:35 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit be609ea
Merge: ef02ec7 3c6acf5
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 25 13:42:36 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit ef02ec7
Merge: dfd7143 abf373a
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 25 13:04:14 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit dfd7143
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 21 17:13:53 2021 +0200

    minor improvements

commit 0f5ee85
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 21 16:47:55 2021 +0200

    #355 subentities are not created when creating a grscicoll entity

commit b6ea3d4
Merge: e4db80a f41f7b7
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 21 16:07:50 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/BaseCollectionEntityIT.java
    #	registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java
    #	registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/ExtendedCollectionEntityResource.java
    #	registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java

commit e4db80a
Merge: 9041605 435bc66
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 21 09:31:10 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 9041605
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 20 16:07:24 2021 +0200

    fixes

commit d3e63ab
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 20 13:24:17 2021 +0200

    using proposerEmail in the list method

commit f502292
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 20 13:10:17 2021 +0200

    audit log + change suggestions fixes

commit 65385c6
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 20 10:25:09 2021 +0200

    renamed proposerEmail to proposedBy

commit 742ce5c
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 20 10:23:49 2021 +0200

    renamed proposerEmail to proposedBy

commit a461378
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 20 10:09:33 2021 +0200

    renamed proposerEmail to proposedBy

commit a91a3ab
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 20 09:57:03 2021 +0200

    renamed proposerEmail to proposedBy

commit 70d3877
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 19 17:18:02 2021 +0200

    minor improvements

commit 28f4280
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 19 15:41:01 2021 +0200

    minor improvements

commit 6161872
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 19 14:39:44 2021 +0200

    fixed tests

commit a6eb5be
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 19 14:09:39 2021 +0200

    minor fixes

commit 1f9187f
Merge: e21b4bf d1c610a
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 19 10:08:05 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	pom.xml

commit e21b4bf
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 19 10:07:08 2021 +0200

    Audit log ITs + fixes

commit 3399241
Merge: 236ed3a fea95bb
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Mon May 17 11:06:55 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	pom.xml
    #	registry-ws/pom.xml

commit 236ed3a
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Mon May 17 11:05:00 2021 +0200

    fixed tests

commit 6e888ad
Merge: 3a4d1c0 3830c52
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 11 21:09:50 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 3a4d1c0
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 11 21:08:59 2021 +0200

    audit log WIP

commit 2096774
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 7 10:19:13 2021 +0200

    ITs

commit 1064e1b
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 7 10:15:20 2021 +0200

    ITs

commit a3b06d2
Merge: 32a98df 556f326
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Fri May 7 09:53:20 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 32a98df
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 6 17:06:15 2021 +0200

    change suggestions emails + ITs

commit 33c27f1
Merge: f609ad2 59fb185
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 6 17:05:44 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit f609ad2
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu May 6 10:34:12 2021 +0200

    security change suggestions + email validation

commit 1ea35d6
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 5 13:59:38 2021 +0200

    added resource ITs for merging services

commit b9526c6
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 5 13:18:53 2021 +0200

    use of new interfaces for services

commit c1b0baf
Merge: 589d00b a3e6b82
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 5 10:36:16 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 589d00b
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed May 5 10:35:41 2021 +0200

    spliting config in ITs

commit 2eb6110
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 4 17:28:43 2021 +0200

    IT for grscicoll duplicates

commit 02aacf6
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 4 17:03:26 2021 +0200

    PrimaryCollectionEntity + minor improvements

commit b7964d9
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 4 16:24:01 2021 +0200

    split ITs into service and resource tests (WIP)

commit 7595f92
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 4 16:03:44 2021 +0200

    merge dev

commit 743ccb9
Merge: e47fac9 1f19447
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 4 16:02:38 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java
    #	registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java
    #	registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PrimaryCollectionEntityServiceIT.java
    #	registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java

commit e47fac9
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue May 4 15:59:04 2021 +0200

    split ITs into service and resource (WIP)

commit 0c47799
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Mon May 3 12:12:24 2021 +0200

    split ITs into service and resource (WIP)

commit 0d8b7ad
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 29 17:46:33 2021 +0200

    moved security to the service layer of collections

commit 5f0d94a
Merge: ff4f526 1c4ea2d
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 29 16:57:43 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit ff4f526
Merge: 49cb02c de459b9
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 29 16:14:53 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java
    #	registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java

commit 49cb02c
Merge: 4e10530 6717f1f
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 29 13:01:45 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java
    #	registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java
    #	registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java

commit 4e10530
Merge: f8b3b1b 710daf4
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed Apr 28 19:14:48 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java
    #	registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java

commit f8b3b1b
Merge: 1048791 0419758
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed Apr 28 18:29:43 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

    # Conflicts:
    #	registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/CollectionIT.java
    #	registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java
    #	registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java

commit 1048791
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Wed Apr 28 18:15:22 2021 +0200

    added service layer for grscicoll + audit log (WIP)

commit 0507876
Merge: 2b1d195 6c4501c
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Tue Apr 27 16:49:26 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 2b1d195
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 22 15:08:12 2021 +0200

    GRSciColl suggestions: ignoring synthetic fields

commit 332f7fb
Merge: 73a7c67 bf90c11
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 22 14:04:17 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 73a7c67
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 22 14:04:05 2021 +0200

    GRSciColl suggestions V1

commit 763a879
Merge: 0e69d1d 4c91b09
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 22 12:54:45 2021 +0200

    Merge branch 'dev' into #343_suggest_change_and_log

commit 0e69d1d
Author: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date:   Thu Apr 22 12:54:26 2021 +0200

    GRSciColl suggestions V1
  • Loading branch information
@marcos-lg
marcos-lg committed Jun 4, 2021
1 parent cdb1358 commit 2ce0294
Show file tree
Hide file tree
Showing 160 changed files with 11,047 additions and 3,754 deletions.
8 changes: 7 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,10 @@
<spring-cloud-zookeeper.version>2.2.4.RELEASE</spring-cloud-zookeeper.version>
<mybatis-spring-boot-starter.version>2.0.1</mybatis-spring-boot-starter.version>
<springdoc-openapi-ui.version>1.5.8</springdoc-openapi-ui.version>
<spring-cloud-sleuth.version>2.2.8.RELEASE</spring-cloud-sleuth.version>

<!-- GBIF -->
<gbif-api.version>0.152</gbif-api.version>
<gbif-api.version>0.153-SNAPSHOT</gbif-api.version>
<gbif-common.version>0.50</gbif-common.version>
<gbif-common-mybatis.version>1.1</gbif-common-mybatis.version>
<gbif-common-ws.version>1.15</gbif-common-ws.version>
Expand Down Expand Up @@ -218,6 +219,11 @@
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring-boot-admin.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
<version>${spring-cloud-sleuth.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion registry-cli/src/main/java/org/gbif/registry/cli/datasetupdater/DatasetUpdater.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.gbif.registry.cli.common.stubs.EventManagerStub;
import org.gbif.registry.cli.common.stubs.SearchServiceStub;
import org.gbif.registry.service.RegistryDatasetServiceImpl;
import org.gbif.registry.service.WithMyBatis;
import org.gbif.registry.ws.resources.DatasetResource;

import java.util.List;
Expand Down Expand Up @@ -72,7 +73,8 @@ private AnnotationConfigApplicationContext prepareContext(DatasetUpdaterConfigur
EditorAuthorizationServiceStub.class,
EventManagerStub.class,
RegistryDatasetServiceImpl.class,
DatasetResource.class)
DatasetResource.class,
WithMyBatis.class)
.build();
}

Expand Down
3 changes: 2 additions & 1 deletion registry-cli/src/main/java/org/gbif/registry/cli/directoryupdate/DirectoryUpdateService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.gbif.registry.cli.directoryupdate;

import org.gbif.registry.cli.common.spring.SpringContextBuilder;
import org.gbif.registry.service.WithMyBatis;

import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
Expand Down Expand Up @@ -61,7 +62,7 @@ public DirectoryUpdateService(DirectoryUpdateConfiguration config) {
SpringContextBuilder.create()
.withDbConfiguration(config.db)
.withDirectoryConfiguration(config.directory)
.withComponents(DirectoryUpdater.class)
.withComponents(DirectoryUpdater.class, WithMyBatis.class)
.build(),
Executors.newScheduledThreadPool(1));
}
Expand Down
2 changes: 1 addition & 1 deletion registry-cli/src/main/java/org/gbif/registry/cli/directoryupdate/DirectoryUpdater.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.gbif.api.service.directory.ParticipantService;
import org.gbif.api.vocabulary.IdentifierType;
import org.gbif.registry.cli.common.DirectoryRegistryMapping;
import org.gbif.registry.persistence.WithMyBatis;
import org.gbif.registry.service.WithMyBatis;
import org.gbif.registry.persistence.mapper.IdentifierMapper;
import org.gbif.registry.persistence.mapper.NodeMapper;

Expand Down
118 changes: 118 additions & 0 deletions registry-domain/src/main/java/org/gbif/registry/domain/collections/AuditLog.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
package org.gbif.registry.domain.collections;

import org.gbif.api.model.collections.CollectionEntityType;

import java.util.Date;
import java.util.UUID;

public class AuditLog {

private long key;
private long traceId;
private CollectionEntityType collectionEntityType;
private String subEntityType;
private String operation;
private UUID collectionEntityKey;
private String subEntityKey;
private UUID replacementKey;
private Date created;
private String createdBy;
private String preState;
private String postState;

public long getKey() {
return key;
}

public void setKey(long key) {
this.key = key;
}

public long getTraceId() {
return traceId;
}

public void setTraceId(long traceId) {
this.traceId = traceId;
}

public CollectionEntityType getCollectionEntityType() {
return collectionEntityType;
}

public void setCollectionEntityType(CollectionEntityType collectionEntityType) {
this.collectionEntityType = collectionEntityType;
}

public String getSubEntityType() {
return subEntityType;
}

public void setSubEntityType(String subEntityType) {
this.subEntityType = subEntityType;
}

public String getOperation() {
return operation;
}

public void setOperation(String operation) {
this.operation = operation;
}

public UUID getCollectionEntityKey() {
return collectionEntityKey;
}

public void setCollectionEntityKey(UUID collectionEntityKey) {
this.collectionEntityKey = collectionEntityKey;
}

public String getSubEntityKey() {
return subEntityKey;
}

public void setSubEntityKey(String subEntityKey) {
this.subEntityKey = subEntityKey;
}

public UUID getReplacementKey() {
return replacementKey;
}

public void setReplacementKey(UUID replacementKey) {
this.replacementKey = replacementKey;
}

public Date getCreated() {
return created;
}

public void setCreated(Date created) {
this.created = created;
}

public String getCreatedBy() {
return createdBy;
}

public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}

public String getPreState() {
return preState;
}

public void setPreState(String preState) {
this.preState = preState;
}

public String getPostState() {
return postState;
}

public void setPostState(String postState) {
this.postState = postState;
}
}
4 changes: 3 additions & 1 deletion registry-domain/src/main/java/org/gbif/registry/domain/collections/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
*/
package org.gbif.registry.domain.collections;

public class Constants {
public final class Constants {

public static final String IDIGBIO_NAMESPACE = "iDigBio.org";
public static final String IH_NAMESPACE = "ih.gbif.org";
public static final String IRN_TAG = "irn";
}
21 changes: 21 additions & 0 deletions ...omain/src/main/java/org/gbif/registry/domain/mail/GrscicollChangeSuggestionDataModel.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.gbif.registry.domain.mail;

import java.net.URL;

/**
* Model to generate an email to notify the creation of a GRSciColl change suggestion.
*
* <p>This class is required to be public for Freemarker.
*/
public class GrscicollChangeSuggestionDataModel {

private URL changeSuggestionUrl;

public URL getChangeSuggestionUrl() {
return changeSuggestionUrl;
}

public void setChangeSuggestionUrl(URL changeSuggestionUrl) {
this.changeSuggestionUrl = changeSuggestionUrl;
}
}
9 changes: 8 additions & 1 deletion registry-events/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,20 @@
<groupId>org.gbif</groupId>
<artifactId>gbif-httputils</artifactId>
</dependency>

<dependency>
<groupId>org.gbif.registry</groupId>
<artifactId>registry-persistence</artifactId>
</dependency>

<!-- Third party dependencies -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit 2ce0294

Please sign in to comment.