-
-
Notifications
You must be signed in to change notification settings - Fork 0
Issue#6 #7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
isalvadori
wants to merge
13
commits into
develop
Choose a base branch
from
issue#6
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Issue#6 #7
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
3ad7802
issue#1: added component for generating dummy himsa patient data
302a84e
moved datafaker yml in resources folder for repackaging
7cfb034
removed datafaker from workspace and used local jar from gecko.libraries
2510502
issue#4
83703b6
Model change warning
maho7791 64397e4
issue#4
097ee04
Merge branch 'issue#4' of [email protected]:DataInMotion/avatar-dataspac…
428bf64
added deps for cm2 model from gecko.emf.models
b65f77c
issue#6: create some dummy content (not finished)
4ec5c9e
missing files
abbf93a
added creation of dummy Consent into the gICS system
13f0c7b
added rest endpoint for retrieving patients with consent
a15f9fb
removed unused test bundle
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1706083395275"/> | ||
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1733212185164"/> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
7d4feb1a8c44c30021d4161f8ab90517f8144c8a93730fd975b47eadc35163cb |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<classpath> | ||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"> | ||
<attributes> | ||
<attribute name="module" value="true"/> | ||
</attributes> | ||
</classpathentry> | ||
<classpathentry kind="con" path="aQute.bnd.classpath.container"/> | ||
<classpathentry kind="src" output="bin" path="src"/> | ||
<classpathentry kind="output" path="bin"/> | ||
</classpath> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/bin_test/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<projectDescription> | ||
<name>org.avatar.gics.service</name> | ||
<comment></comment> | ||
<projects> | ||
</projects> | ||
<buildSpec> | ||
<buildCommand> | ||
<name>org.eclipse.jdt.core.javabuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>bndtools.core.bndbuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
</buildSpec> | ||
<natures> | ||
<nature>org.eclipse.jdt.core.javanature</nature> | ||
<nature>bndtools.core.bndnature</nature> | ||
</natures> | ||
</projectDescription> |
5 changes: 5 additions & 0 deletions
5
org.avatar.gics.service/.settings/org.eclipse.core.resources.prefs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
eclipse.preferences.version=1 | ||
encoding//src/org/avatar/gics/service/api/GICSService.java=UTF-8 | ||
encoding/<project>=UTF-8 | ||
encoding/bnd.bnd=UTF-8 | ||
encoding/launch.bndrun=UTF-8 |
14 changes: 14 additions & 0 deletions
14
org.avatar.gics.service/.settings/org.eclipse.jdt.core.prefs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
eclipse.preferences.version=1 | ||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 | ||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
org.eclipse.jdt.core.compiler.compliance=17 | ||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled | ||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning | ||
org.eclipse.jdt.core.compiler.release=enabled | ||
org.eclipse.jdt.core.compiler.source=17 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
-library: enable-emf | ||
|
||
javac.source: 17 | ||
javac.target: 17 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not needed inherited from build.bnd resp. dimc library |
||
|
||
Bundle-Version: ${project-version} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not needed inherited from build.bnd resp. dimc library |
||
-buildpath: \ | ||
org.xmlsoap.model,\ | ||
org.emau.icmvc.ganimed.ttp.cm2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
#-runfw: org.apache.felix.framework;version=5 | ||
#-runee: JavaSE-1.8 | ||
|
||
-runprovidedcapabilities: ${native_capability} | ||
|
||
-resolve.effective: active;skip:="osgi.service" | ||
|
||
-runbundles: \ | ||
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\ | ||
org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\ | ||
org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\ | ||
org.apache.felix.scr;version='[2.2.10,2.2.11)',\ | ||
org.avatar.gics.service;version=snapshot,\ | ||
org.osgi.service.component;version='[1.5.1,1.5.2)',\ | ||
org.osgi.util.function;version='[1.2.0,1.2.1)',\ | ||
org.osgi.util.promise;version='[1.3.0,1.3.1)',\ | ||
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ | ||
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\ | ||
org.gecko.emf.osgi.component;version='[6.0.1,6.0.2)',\ | ||
org.osgi.service.log;version='[1.5.0,1.5.1)',\ | ||
org.osgi.util.converter;version='[1.0.9,1.0.10)',\ | ||
org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ | ||
org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ | ||
org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ | ||
org.xmlsoap.model;version='[1.0.0,1.0.1)',\ | ||
org.emau.icmvc.ganimed.ttp.cm2;version='[1.0.0,1.0.1)' | ||
|
||
-runrequires: \ | ||
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\ | ||
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\ | ||
bnd.identity;id='org.avatar.gics.service' | ||
-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' | ||
-runee: JavaSE-17 |
15 changes: 15 additions & 0 deletions
15
org.avatar.gics.service/src/org/avatar/gics/service/api/GICSService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package org.avatar.gics.service.api; | ||
|
||
import org.emau.icmvc.ganimed.ttp.cm2.AddConsentResponse; | ||
import org.emau.icmvc.ganimed.ttp.cm2.ConsentDTO; | ||
import org.emau.icmvc.ganimed.ttp.cm2.GetAllConsentedIdsForResponse; | ||
import org.osgi.annotation.versioning.ProviderType; | ||
|
||
@ProviderType | ||
public interface GICSService { | ||
|
||
GetAllConsentedIdsForResponse getAllConsentedIdsFor(String domainName, String policyName, String policyVersion, String signerIdTypeName); | ||
|
||
AddConsentResponse addConsent(ConsentDTO consent); | ||
|
||
} |
25 changes: 25 additions & 0 deletions
25
org.avatar.gics.service/src/org/avatar/gics/service/api/GICSServiceConfig.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
/** | ||
* Copyright (c) 2012 - 2024 Data In Motion and others. | ||
* All rights reserved. | ||
* | ||
* This program and the accompanying materials are made | ||
* available under the terms of the Eclipse Public License 2.0 | ||
* which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
* | ||
* Contributors: | ||
* Data In Motion - initial API and implementation | ||
*/ | ||
package org.avatar.gics.service.api; | ||
|
||
/** | ||
* | ||
* @author ilenia | ||
* @since Nov 29, 2024 | ||
*/ | ||
public @interface GICSServiceConfig { | ||
|
||
String url() default ""; | ||
|
||
} |
3 changes: 3 additions & 0 deletions
3
org.avatar.gics.service/src/org/avatar/gics/service/api/package-info.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
@org.osgi.annotation.versioning.Version("1.0.0") | ||
@org.osgi.annotation.bundle.Export | ||
package org.avatar.gics.service.api; |
50 changes: 50 additions & 0 deletions
50
org.avatar.gics.service/src/org/avatar/gics/service/impl/GICSServiceHelper.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/** | ||
* Copyright (c) 2012 - 2024 Data In Motion and others. | ||
* All rights reserved. | ||
* | ||
* This program and the accompanying materials are made | ||
* available under the terms of the Eclipse Public License 2.0 | ||
* which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
* | ||
* Contributors: | ||
* Data In Motion - initial API and implementation | ||
*/ | ||
package org.avatar.gics.service.impl; | ||
|
||
import org.emau.icmvc.ganimed.ttp.cm2.Cm2Factory; | ||
import org.emau.icmvc.ganimed.ttp.cm2.GetAllConsentedIdsFor; | ||
import org.emau.icmvc.ganimed.ttp.cm2.PolicyKeyDTO; | ||
import org.emau.icmvc.ganimed.ttp.cm2.config.CheckConsentConfig; | ||
import org.emau.icmvc.ganimed.ttp.cm2.config.ConfigFactory; | ||
|
||
/** | ||
* | ||
* @author ilenia | ||
* @since Nov 29, 2024 | ||
*/ | ||
public class GICSServiceHelper { | ||
|
||
private GICSServiceHelper() { | ||
|
||
} | ||
|
||
public static GetAllConsentedIdsFor createGetAllConsentedIdsForRequest(String domainName, String policyName, | ||
String policyVersion, String signerIdTypeName) { | ||
|
||
GetAllConsentedIdsFor request = Cm2Factory.eINSTANCE.createGetAllConsentedIdsFor(); | ||
request.setSignerIdTypeName(signerIdTypeName); | ||
PolicyKeyDTO policyKey = Cm2Factory.eINSTANCE.createPolicyKeyDTO(); | ||
policyKey.setDomainName(domainName); | ||
policyKey.setName(policyName); | ||
policyKey.setVersion(policyVersion); | ||
request.setPolicyKey(policyKey); | ||
CheckConsentConfig consentConfig = ConfigFactory.eINSTANCE.createCheckConsentConfig(); | ||
consentConfig.setIgnoreVersionNumber(false); | ||
request.setConfig(consentConfig); | ||
request.setConfig(consentConfig); | ||
return request; | ||
} | ||
|
||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not needed inherited from build.bnd resp. dimc library