michele.artini
/
dnet-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protocols api

This commit is contained in:
Michele Artini 2023-11-22 12:07:31 +01:00
parent e2c6287822
commit 2fcddb3e0d
9 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dnet-app/apps/dnet-wf-aggregation-postgres/src/main/java/eu/dnetlib/wfs/WfExecutorApplication.java
View File

@ -9,8 +9,6 @@ import org.springframework.context.annotation.Bean;
import eu.dnetlib.common.app.AbstractDnetApp;
import eu.dnetlib.common.clients.DnetServiceClientFactory;
import eu.dnetlib.common.clients.SimpleResourceClient;
import eu.dnetlib.common.clients.VocabularyClient;
import eu.dnetlib.common.index.solr.SolrService;
import eu.dnetlib.common.mapping.cleaner.CleanerFactory;
import eu.dnetlib.common.mapping.xslt.DnetXsltFunction;
@ -65,12 +63,12 @@ public class WfExecutorApplication extends AbstractDnetApp {
@Bean
public XsltTransformFactory xsltTransformFactory(final DnetServiceClientFactory clientFactory) {
return new XsltTransformFactory(clientFactory.getClient(SimpleResourceClient.class), xsltFunctions);
return new XsltTransformFactory(clientFactory, xsltFunctions);
}
@Bean
public CleanerFactory cleanerFactory(final DnetServiceClientFactory clientFactory) {
return new CleanerFactory(clientFactory.getClient(SimpleResourceClient.class), clientFactory.getClient(VocabularyClient.class));
return new CleanerFactory(clientFactory);
}
@Bean

6
dnet-app/apps/dnet-wf-manager/src/main/java/eu/dnetlib/wfs/WfManagerApplication.java
View File

@ -8,8 +8,6 @@ import org.springframework.context.annotation.Bean;
import eu.dnetlib.common.app.AbstractDnetApp;
import eu.dnetlib.common.clients.DnetServiceClientFactory;
import eu.dnetlib.common.clients.SimpleResourceClient;
import eu.dnetlib.common.clients.VocabularyClient;
import eu.dnetlib.common.mapping.cleaner.CleanerFactory;
import eu.dnetlib.common.mapping.xslt.DnetXsltFunction;
import eu.dnetlib.common.mapping.xslt.XsltTransformFactory;
@ -42,12 +40,12 @@ public class WfManagerApplication extends AbstractDnetApp {
@Bean
public XsltTransformFactory xsltTransformFactory(final DnetServiceClientFactory clientFactory) {
return new XsltTransformFactory(clientFactory.getClient(SimpleResourceClient.class), xsltFunctions);
return new XsltTransformFactory(clientFactory, xsltFunctions);
}
@Bean
public CleanerFactory cleanerFactory(final DnetServiceClientFactory clientFactory) {
return new CleanerFactory(clientFactory.getClient(SimpleResourceClient.class), clientFactory.getClient(VocabularyClient.class));
return new CleanerFactory(clientFactory);
}
}

10
dnet-app/frontends/is/src/app/main-menu-panels/main-menu-panels.component.html
View File

@ -9,7 +9,7 @@
<mat-expansion-panel-header>
<mat-panel-title>Home</mat-panel-title>
</mat-expansion-panel-header>
<a class="menu-item" routerLink="">Home</a>
<a class="menu-item" routerLink="">Registered services</a>
</mat-expansion-panel>
<mat-expansion-panel *ngIf="isEnabled('datasource_manager')">
@ -82,12 +82,4 @@
</div>
</mat-expansion-panel>
<mat-expansion-panel *ngIf="isEnabled('is_manager')">
<mat-expansion-panel-header>
<mat-panel-title>Info</mat-panel-title>
</mat-expansion-panel-header>
<div>
<a class="menu-item" routerLink="info">Container Info</a>
</div>
</mat-expansion-panel>
</mat-accordion>

14
dnet-app/frontends/is/src/app/protocols/protocols.client.ts
View File

@ -1,14 +0,0 @@
import { Injectable } from '@angular/core';
import { Protocol } from '../common/is.model';
import { ISClient } from '../common/is.client';
@Injectable({
providedIn: 'root'
})
export class ProtocolsClient extends ISClient {
loadProtocols(onSuccess: Function): void {
this.httpGet<Protocol[]>("/proxy/byType/dsm/protocols/", onSuccess);
}
}

0
dnet-app/frontends/is/src/app/protocols/protocols.component.css
View File

17
dnet-app/frontends/is/src/app/protocols/protocols.component.ts
View File

@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { Component, Injectable } from '@angular/core';
import { MatTableDataSource } from '@angular/material/table';
import { Protocol, ProtocolParam } from '../common/is.model';
import { ProtocolsClient } from './protocols.client';
import { ISClient } from '../common/is.client';
export interface ProtocolDatasource {
protocol: string;
@ -11,7 +11,7 @@ export interface ProtocolDatasource {
@Component({
selector: 'app-protocols',
templateUrl: './protocols.component.html',
styleUrls: ['./protocols.component.css']
styleUrls: []
})
export class ProtocolsComponent {
protDatasources: ProtocolDatasource[] = [];
@ -27,5 +27,14 @@ export class ProtocolsComponent {
})
);
}
}
@Injectable({
providedIn: 'root'
})
export class ProtocolsClient extends ISClient {
loadProtocols(onSuccess: Function): void {
this.httpGet<Protocol[]>("/proxy/byType/datasource_manager/api/protocols/", onSuccess);
}
}

12
dnet-app/libs/dnet-common-mapping/src/main/java/eu/dnetlib/common/mapping/cleaner/CleanerFactory.java
View File

@ -7,22 +7,24 @@ import org.dom4j.Document;
import org.dom4j.Node;
import org.dom4j.io.SAXReader;
import eu.dnetlib.common.clients.DnetServiceClientFactory;
import eu.dnetlib.common.clients.SimpleResourceClient;
import eu.dnetlib.common.clients.VocabularyClient;
import eu.dnetlib.errors.CleanerException;
public class CleanerFactory {
private final SimpleResourceClient simpleResourceClient;
private final VocabularyClient vocabularyClient;
private final DnetServiceClientFactory clientFactory;
public CleanerFactory(final SimpleResourceClient simpleResourceClient, final VocabularyClient vocabularyClient) {
this.simpleResourceClient = simpleResourceClient;
this.vocabularyClient = vocabularyClient;
public CleanerFactory(final DnetServiceClientFactory clientFactory) {
this.clientFactory = clientFactory;
}
public Cleaner newCleaner(final String ruleId) throws CleanerException {
final SimpleResourceClient simpleResourceClient = clientFactory.getClient(SimpleResourceClient.class);
final VocabularyClient vocabularyClient = clientFactory.getClient(VocabularyClient.class);
final String prof = simpleResourceClient.findResourceContent(ruleId, String.class);
try {

9
dnet-app/libs/dnet-common-mapping/src/main/java/eu/dnetlib/common/mapping/xslt/XsltTransformFactory.java
View File

@ -2,6 +2,7 @@ package eu.dnetlib.common.mapping.xslt;
import java.util.Map;
import eu.dnetlib.common.clients.DnetServiceClientFactory;
import eu.dnetlib.common.clients.SimpleResourceClient;
import eu.dnetlib.common.mapping.RecordTransformer;
import eu.dnetlib.errors.TransformationException;
@ -10,18 +11,18 @@ public class XsltTransformFactory {
public static final String QNAME_BASE_URI = "http://eu/dnetlib/transform";
private final SimpleResourceClient simpleResourceClient;
private final DnetServiceClientFactory clientFactory;
private final DnetXsltFunction[] xsltFunctions;
public XsltTransformFactory(final SimpleResourceClient simpleResourceClient, final DnetXsltFunction... xsltFunctions) {
this.simpleResourceClient = simpleResourceClient;
public XsltTransformFactory(final DnetServiceClientFactory clientFactory, final DnetXsltFunction... xsltFunctions) {
this.clientFactory = clientFactory;
this.xsltFunctions = xsltFunctions;
}
public RecordTransformer<String, String> getTransformer(final String ruleId, final Map<String, Object> initialParams) throws TransformationException {
try {
final String xsltText = simpleResourceClient.findResourceContent(ruleId, String.class);
final String xsltText = clientFactory.getClient(SimpleResourceClient.class).findResourceContent(ruleId, String.class);
return XsltUtils.newTransformer(xsltText, initialParams, xsltFunctions);

4
start.sh
View File

@ -19,8 +19,8 @@ export PG_MDSTORES_DATA_DB=dnet_mdstores_data
export PG_INDEX_DB=dnet_index_configs
export PG_OAI_DB=dnet_oai
export COMPOSE_PROFILES=base,ui
#export COMPOSE_PROFILES=base,mail,dsm,vocs,mdstores,wfs,index,contexts,oai,ui
#export COMPOSE_PROFILES=base,ui
export COMPOSE_PROFILES=base,mail,dsm,vocs,mdstores,wfs,index,contexts,oai,ui
docker-compose -f docker-compose.dev.yml up --force-recreate --build