Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/314_Maintenance_Release_for_0.5' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hhund committed Mar 21, 2022
2 parents b8a12ae + f99a9f6 commit 39c5153
Show file tree
Hide file tree
Showing 56 changed files with 164 additions and 147 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ preferred-citation:
doi: 10.3233/SHTI210060
type: proceedings
title: "HiGHmed Data Sharing Framework (HiGHmed DSF)"
version: 0.5.4
date-released: 2021-12-10
version: 0.5.5
date-released: 2022-03-21
url: https://github.com/highmed/highmed-dsf/wiki
repository-code: https://github.com/highmed/highmed-dsf
repository-artifact: https://github.com/highmed/highmed-dsf/releases
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-process-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* A provider configuration file named "org.highmed.dsf.DsfProcessPluginDefinition" containing the canonical name of the
* class implementing this interface needs to be part of the process plugin at "/META-INF/services/". For more details
* on the content of the provider configuration file, see {@link ServiceLoader}.
*
*
* Additional {@link TypedValueSerializer}s to be registered inside the camunda process engine need be defined as beans
* in the process plugins spring context.
*/
Expand Down Expand Up @@ -47,9 +47,9 @@ default String getNameAndVersion()
/**
* Return <code>Stream.of("foo.bpmn");</code> for a foo.bpmn file located in the root folder of the process plugin
* jar. The returned files will be read via {@link ClassLoader#getResourceAsStream(String)}.
*
*
* @return *.bpmn files inside process plugin jar
*
*
* @see ClassLoader#getResourceAsStream(String)
*/
Stream<String> getBpmnFiles();
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-server-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/**
* Adds before execution of a process a listener to every BPMN Start- and EndEvent as well as to CallActivities
*
*
* @see StartListener
* @see CallActivityListener
* @see EndListener
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ public interface ProcessPluginProvider
{
/**
* Expected folder/file structure:
*
*
* <pre>
* pluginDirectory/foo_plugin.jar
*
*
* pluginDirectory/bar_plugin.jar
*
*
* pluginDirectory/baz_plugin/plugin.jar
* pluginDirectory/baz_plugin/helper.jar
* </pre>
*
*
* The folder structure above will result in three separate class loaders being used. The jar files foo_plugin.jar
* and bar_plugin.jar will be loaded in a separate class loader each. All jar files in the baz_plugin directory will
* be loaded within the same class loader.
*
*
* @return Plug in definitions found in jar files within a pluginDirectory or jar files within folders within a
* pluginDirectory and associated class loaders
*/
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-webservice-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public interface ReadAccessHelper

/**
* Adds LOCAL tag. Removes ALL tag if present.
*
*
* @param <R>
* the resource type
* @param resource
Expand All @@ -42,7 +42,7 @@ public interface ReadAccessHelper

/**
* Adds ORGANIZATION tag for the given organization. Adds LOCAL tag if not present, removes ALL tag if present.
*
*
* @param <R>
* the resource type
* @param resource
Expand All @@ -57,7 +57,7 @@ public interface ReadAccessHelper

/**
* Adds ORGANIZATION tag for the given organization. Adds LOCAL tag if not present, removes ALL tag if present.
*
*
* @param <R>
* the resource type
* @param resource
Expand All @@ -76,7 +76,7 @@ public interface ReadAccessHelper

/**
* Adds ROLE tag for the given affiliation. Adds LOCAL tag if not present, removes ALL tag if present.
*
*
* @param <R>
* the resource type
* @param resource
Expand All @@ -95,7 +95,7 @@ public interface ReadAccessHelper

/**
* Adds ROLE tag for the given affiliation. Adds LOCAL tag if not present, removes ALL tag if present.
*
*
* @param <R>
* the resource type
* @param resource
Expand All @@ -115,7 +115,7 @@ public interface ReadAccessHelper

/**
* Adds All tag. Removes LOCAL, ORGANIZATION and ROLE tags if present.
*
*
* @param <R>
* the resource type
* @param resource
Expand Down Expand Up @@ -147,15 +147,15 @@ public interface ReadAccessHelper

/**
* <b>Resource with access tags valid if:</b><br>
*
*
* 1 LOCAL tag and n {ORGANIZATION, ROLE} tags {@code (n >= 0)}<br>
* or<br>
* 1 ALL tag<br>
* <br>
* All tags {LOCAL, ORGANIZATION, ROLE, ALL} valid<br>
* <br>
* Does not check if referenced organizations or roles exist
*
*
* @param resource
* may be <code>null</code>
* @return <code>false</code> if given <b>resource</b> is <code>null</code> or resource not valid
Expand All @@ -164,13 +164,13 @@ public interface ReadAccessHelper

/**
* <b>Resource with access tags valid if:</b><br>
*
*
* 1 LOCAL tag and n {ORGANIZATION, ROLE} tags {@code (n >= 0)}<br>
* or<br>
* 1 ALL tag<br>
* <br>
* All tags {LOCAL, ORGANIZATION, ROLE, ALL} valid
*
*
* @param resource
* may be <code>null</code>
* @param organizationWithIdentifierExists
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-rest-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.5.4</version>
<version>0.5.5</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public final Optional<String> reasonUpdateAllowed(Connection connection, User us
/**
* No need to check if the new resource is valid, will be checked by
* {@link #newResourceOk(Connection, User, Resource)}
*
*
* @param connection
* not <code>null</code>
* @param oldResource
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param user
* not <code>null</code>
* @param newResource
Expand All @@ -23,7 +23,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param connection
* not <code>null</code>
* @param user
Expand All @@ -36,7 +36,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param user
* not <code>null</code>
* @param existingResource
Expand All @@ -47,7 +47,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param connection
* not <code>null</code>
* @param user
Expand All @@ -60,7 +60,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param user
* not <code>null</code>
* @param oldResource
Expand All @@ -73,7 +73,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param connection
* not <code>null</code>
* @param user
Expand All @@ -88,7 +88,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param user
* not <code>null</code>
* @param oldResource
Expand All @@ -99,7 +99,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param connection
* not <code>null</code>
* @param user
Expand All @@ -112,7 +112,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param user
* not <code>null</code>
* @return Reason as String in {@link Optional#of(Object)} if delete allowed
Expand All @@ -121,7 +121,7 @@ public interface AuthorizationRule<R extends Resource>

/**
* Override this method for non default behavior. Default: Not allowed.
*
*
* @param user
* not <code>null</code>
* @return Reason as String in {@link Optional#of(Object)} if delete allowed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public interface OrganizationDao extends ResourceDao<Organization>

/**
* Uses <i>http://highmed.org/sid/organization-identifier</i> as identifier system
*
*
* @param identifierValue
* may be <code>null</code>
* @return {@link Optional#empty()} if param <b>identifierValue</b> is null or {@link String#isBlank()}
Expand Down
Loading

0 comments on commit 39c5153

Please sign in to comment.