Skip to content
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

Feature/init cosys integration #134

Merged
merged 35 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3b2eb80
:tada: cosys cp from digiwf
simonhir Sep 4, 2024
9700c64
:recycle: cosys refactor poms
simonhir Sep 4, 2024
80c8fed
:recycle: cosys cleanup poms
simonhir Sep 4, 2024
b030089
:fire: cosys rm streaming adapter
simonhir Sep 4, 2024
da4341c
:recycle: cosys rm presignedurls and refactor digiwf exceptions
simonhir Sep 4, 2024
f8d4ca4
:fire: cosys rm archunit test
simonhir Sep 4, 2024
5c493d4
:recycle: cosys update package names
simonhir Sep 4, 2024
8b32942
:recycle: cosys convert domain models to records
simonhir Sep 4, 2024
feb572f
:art: cosys format with spotless
simonhir Sep 4, 2024
3fc60a4
:fire: cosys rm unneeded openapi generator files
simonhir Sep 4, 2024
ea0833b
:fire: cosys refactor digiwf naming for classes and properties
simonhir Sep 4, 2024
11b875e
:art: s3 format with spotless
simonhir Sep 4, 2024
ff5854d
:recycle: s3 configure oauth provider s3 specific
simonhir Sep 5, 2024
986e14b
:sparkles: cosys init auth config in starter
simonhir Sep 5, 2024
7991faf
:memo: cosys update README.md
simonhir Sep 5, 2024
435b02d
Merge branch 'refs/heads/main' into feature/init-cosys-integration
simonhir Sep 10, 2024
80d56b0
:fire: cosys rm deprecated comment
simonhir Sep 10, 2024
d1f79ef
:pushpin: cosys cleanup pom versions
simonhir Sep 10, 2024
96c71a3
Merge branch 'main' into feature/init-cosys-integration
simonhir Sep 17, 2024
0af9f8c
Merge branch 'refs/heads/main' into feature/init-cosys-integration
simonhir Sep 19, 2024
a8aacf0
:recycle: cosys rm oauth config through starter
simonhir Sep 19, 2024
a964375
Merge branch 'main' into feature/init-cosys-integration
simonhir Sep 19, 2024
e34339f
:recycle: cosys example use new oauth2 config style
simonhir Sep 19, 2024
f0dd6a6
:bookmark: cosys fix versions after bump
simonhir Sep 19, 2024
9a2c82b
:bookmark: cosys fix versions after bump
simonhir Sep 19, 2024
cb0df93
:bug: cosys rm oauth config through starter fix import
simonhir Sep 19, 2024
8226efe
Merge branch 'refs/heads/main' into feature/init-cosys-integration
simonhir Nov 12, 2024
a76140b
:rotating_light: fix pmd warnings
simonhir Nov 12, 2024
3d5b2b6
fix cosys name typo
simonhir Nov 14, 2024
b6d9711
:recycle: cosys align mockito usage
simonhir Nov 14, 2024
3beb56f
:fire: cosys rm unneeded format suppress
simonhir Nov 14, 2024
ab00427
:sparkles: cosys validate merge props and add example
simonhir Nov 14, 2024
a8524ee
:sparkles: cosys add link to product
simonhir Nov 14, 2024
68bd086
:recycle: cosys example use example url for cosys
simonhir Nov 14, 2024
1efa84f
Merge branch 'main' into feature/init-cosys-integration
simonhir Nov 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions refarch-integrations/README.md
devtobi marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Collection of different integration which can be used as is in RefArch projects.
in other integrations.
- [email-integration](./refarch-email-integration/README.md): For sending text and html emails with attachments. Uses
s3-integration for file handling.
- [cosys-integration](./refarch-cosys-integration/README.md): For creating documents with cosys. Uses
simonhir marked this conversation as resolved.
Show resolved Hide resolved
s3-integration for file handling.

## Naming conventions

Expand Down
10 changes: 6 additions & 4 deletions refarch-integrations/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<relativePath />
<relativePath/>
</parent>

<groupId>de.muenchen.refarch</groupId>
Expand All @@ -19,6 +20,7 @@
<modules>
<module>refarch-s3-integration</module>
<module>refarch-email-integration</module>
<module>refarch-cosys-integration</module>
</modules>

<properties>
Expand Down Expand Up @@ -232,8 +234,8 @@
<eclipse>
<file>itm-java-codeformat/java_codestyle_formatter.xml</file>
</eclipse>
<trimTrailingWhitespace />
<endWithNewline />
<trimTrailingWhitespace/>
<endWithNewline/>
</java>
</configuration>
<executions>
Expand Down
37 changes: 37 additions & 0 deletions refarch-integrations/refarch-cosys-integration/README.md
simonhir marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# RefArch CoSys integration

Integration for creating documents with cosys. Uses s3-integration for file handling.
simonhir marked this conversation as resolved.
Show resolved Hide resolved

## Usage

```xml

<dependencies>
<dependency>
<groupId>de.muenchen.refarch</groupId>
<artifactId>refarch-cosys-integration-starter</artifactId>
<version>...</version>
</dependency>
</dependencies>
```

and a [s3-integration starter](../refarch-s3-integration/README.md#usage).

## Configuration

Following are the properties to configure the different modules. Some of them are custom defined and others are synonyms
for spring package properties.
Whether a property is an alias can be checked in the corresponding `application.yml` of each module.

### refarch-cosys-integration-starter

| Property | Description |
|--------------------------------------|-------------------------------------------------------------------------------|
| `refarch.cosys.url` | Url of the CoSys service |
| `refarch.cosys.merge.datafile` | |
| `refarch.cosys.merge.inputLanguage` | incoming language |
| `refarch.cosys.merge.outputLanguage` | outgoing language |
| `refarch.cosys.merge.keepFields` | |
| `SSO_COSYS_ISSUER_URL` | Issuer url of oAuth2 service to use for authentication against cosys service. |
| `SSO_COSYS_CLIENT_ID` | Client id to be used for authentication against cosys. |
| `SSO_COSYS_CLIENT_SECRET` | Client secret to be used for gathering client service account token. |
34 changes: 34 additions & 0 deletions refarch-integrations/refarch-cosys-integration/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>de.muenchen.refarch</groupId>
<artifactId>refarch-integrations</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>refarch-cosys-integration</artifactId>
<description>CoSys integration</description>
<packaging>pom</packaging>

<modules>
<module>refarch-cosys-integration-client</module>
<module>refarch-cosys-integration-core</module>
<module>refarch-cosys-integration-starter</module>
<module>refarch-cosys-integration-example</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>de.muenchen.refarch</groupId>
<artifactId>refarch-s3-integration-client-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.muenchen.refarch</groupId>
<artifactId>refarch-cosys-integration</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>refarch-cosys-integration-client</artifactId>

<properties>
<openapi-generator-maven-plugin.version>7.8.0</openapi-generator-maven-plugin.version>

<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
</properties>

<dependencies>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>

<!-- openApi -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>${jackson-databind-nullable.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>${openapi-generator-maven-plugin.version}</version>
<executions>
<execution>
<id>cosys-api</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${project.basedir}/src/main/api/api-docs.json</inputSpec>
<library>webclient</library>
<generatorName>java</generatorName>

<apiPackage>de.muenchen.refarch.integration.cosys.api</apiPackage>
<modelPackage>de.muenchen.refarch.integration.cosys.model</modelPackage>
<invokerPackage>de.muenchen.refarch.integration.cosys</invokerPackage>

<generateApiTests>false</generateApiTests>
<generateModelTests>false</generateModelTests>
<generateApiDocumentation>false</generateApiDocumentation>
<generateModelDocumentation>false</generateModelDocumentation>
<generateSupportingFiles>true</generateSupportingFiles>
<configOptions>
<hideGenerationTimestamp>true</hideGenerationTimestamp>
<useJakartaEe>true</useJakartaEe>
</configOptions>

<globalProperties>
<supportingFiles>
ApiClient.java,JavaTimeFormatter.java,Authentication.java,OAuth.java,ApiKeyAuth.java,HttpBasicAuth.java,HttpBearerAuth.java,RFC3339DateFormat.java
</supportingFiles>
</globalProperties>

</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Loading
Loading