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

#74 dookug 2.7.0 update #75

Merged
merged 5 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion docs/install.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ DOOKUG_SERVICE_CACHE_TEMPLATE_ENABLESTATISTIC=false <3>
* Ajánlott konfiguráció

// TODO visszatenni, ha a docker-es dolgok is átherültek a gitHub-ra
// További kulcsok itt találhatók: https://common.pages-dev.icellmobilsoft.hu/baseimages/docker-wildfly/master/#_wildflyoracle_jdbc[wildfly/oracle-jdbc konfiguráció]
// További kulcsok itt találhatók: https://i-cell-mobilsoft-open-source.github.io/docker-wildfly/#wildfly-oracle-jdbc[wildfly/oracle-jdbc konfiguráció]

[options="header",cols="1,1,1"]
|===
Expand Down Expand Up @@ -203,3 +203,11 @@ ifdef::generatedDoc[]
include::../generated/dookug-api-dto-config.adoc[leveloffset=+1]

endif::[]


=== Létrehozás és módosítás dátuma

A coffee 2.7.0 verziója óta az adatábizba mentendő OffsetDateTime típusoknál a zóna most már beállítható a létrehozás és módosítás dátumánál.
Ezt a `COFFEE_MODEL_BASE_JAVA_TIME_TIMEZONE_ID` környezeti változóval lehet megtenni, melynek alapértelmezett értéke `UTC`, de beállítható bármi amit a java.time.ZoneId osztály `public static ZoneId of(String zoneId)` metódusa befogad paraméterben.

Rossz érték esetén warn szintű hibaüzenet keletkezik, és a default értéket veszi alapu, ami `TimeZone.getDefault().toZoneId()` lesz.
12 changes: 11 additions & 1 deletion docs/release-notes/v1.0.0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,14 @@
* gitHub Workflows - java 17 upgrade
* Bugfix: The `not` helper function has been fixed, it evaluated the `false` parameter incorrectly.
* Handlebars version bump: 4.3.1 -> 4.4.0
* Handlebars caching: Handlebars template engine now uses its in-built caching mechanism for compiled templates
* Handlebars caching: Handlebars template engine now uses its in-built caching mechanism for compiled templates
* coff:ee upgrade - migration doc: https://i-cell-mobilsoft-open-source.github.io/coffee/#_v2_5_0_v2_6_0[2.5.0 -> 2.6.0]
* coff:ee upgrade - migration doc: https://i-cell-mobilsoft-open-source.github.io/coffee/#_v2_6_0_v2_7_0[2.6.0 -> 2.7.0]

NOTE: The client is not affected by the coffee upgrade, it remains 2.6.0 coffee . The reason for this is that you should upgrade to 2.7.0 on the project that uses coffee.

IMPORTANT: Because of the coffee upgrade, the use of interfaces had to be removed from the clients, because it already uses the coffee 2.7.0 BaseException, and would cause a break in the client.

* For `dookug-model`, `org.hibernate` groupId has been replaced by `org.hibernate.orm`.
* Roaster upgrade migration: https://i-cell-mobilsoft-open-source.github.io/roaster/#_2_1_0_2_2_0[2.1.0 -> 2.2.0]
* In tests, the coffee.model.base.java.time.timezone.id property in the BaseIT class is set to UTC.
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import java.io.IOException;

import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.dto.exception.BaseExceptionWrapper;
import hu.icellmobilsoft.coffee.se.api.exception.BaseException;

/**
* {@code IOException} csomagolása {@code BaseException} formára hogy a hibakezelés automatama lehessen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
import org.eclipse.microprofile.openapi.annotations.tags.Tag;

import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifier;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifiers;
import hu.icellmobilsoft.coffee.rest.log.annotation.enumeration.LogSpecifierTarget;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;

import hu.icellmobilsoft.coffee.cdi.annotation.xml.ValidateXML;
import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifier;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifiers;
import hu.icellmobilsoft.coffee.rest.log.annotation.enumeration.LogSpecifierTarget;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.eclipse.microprofile.openapi.annotations.tags.Tag;

import hu.icellmobilsoft.coffee.cdi.annotation.xml.ValidateXML;
import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifier;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifiers;
import hu.icellmobilsoft.coffee.rest.log.annotation.enumeration.LogSpecifierTarget;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.eclipse.microprofile.openapi.annotations.tags.Tag;

import hu.icellmobilsoft.coffee.cdi.annotation.xml.ValidateXML;
import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
import hu.icellmobilsoft.dookug.api.dto.constants.IOpenapiConstants;
import hu.icellmobilsoft.dookug.api.url.DocumentGeneratePath;
import hu.icellmobilsoft.dookug.common.dto.constant.XsdConstants;
Expand Down
164 changes: 0 additions & 164 deletions dookug-bom/dookug-bom-all-coffee20/pom.xml

This file was deleted.

10 changes: 8 additions & 2 deletions dookug-bom/dookug-bom-all-jee10/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<version.net.sourceforge.saxon.saxon>9.1.0.8</version.net.sourceforge.saxon.saxon>
<version.net.sourceforge.saxon.he>12.4</version.net.sourceforge.saxon.he>
<version.org.apache.commons.commons-text>1.10.0</version.org.apache.commons.commons-text>

</properties>

<dependencyManagement>
Expand All @@ -51,6 +50,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>hu.icellmobilsoft.dookug</groupId>
<artifactId>dookug-bom-test</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
Expand All @@ -60,7 +66,7 @@
</dependency>
<dependency>
<groupId>hu.icellmobilsoft.coffee</groupId>
<artifactId>coffee-bom</artifactId>
<artifactId>coffee-bom-project</artifactId>
<version>${version.hu.icellmobilsoft.coffee}</version>
<type>pom</type>
<scope>import</scope>
Expand Down
6 changes: 2 additions & 4 deletions dookug-bom/dookug-bom-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
<version.apache.deltaspike>1.9.6</version.apache.deltaspike>
<version.org.eclipse.microprofile>4.1</version.org.eclipse.microprofile>

<version.io.smallrye.config>2.10.0</version.io.smallrye.config>
<version.io.smallrye.config>3.0.0</version.io.smallrye.config>

<version.hu.icellmobilsoft.roaster>0.8.0</version.hu.icellmobilsoft.roaster>
<version.org.apache.commons.commons-text>1.10.0</version.org.apache.commons.commons-text>

<version.com.github.jknack.handlebars>4.4.0</version.com.github.jknack.handlebars>
<version.com.openhtmltopdf.openhtmltopdf-pdfbox>1.0.10</version.com.openhtmltopdf.openhtmltopdf-pdfbox>
<version.org.apache.xmlgraphics.fop>2.5</version.org.apache.xmlgraphics.fop>
<version.net.sourceforge.saxon.saxon>9.1.0.8</version.net.sourceforge.saxon.saxon>

<version.org.junit.jupiter>5.8.1</version.org.junit.jupiter>
<version.org.junit.jupiter>5.9.1</version.org.junit.jupiter>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -183,7 +182,6 @@
<artifactId>saxon</artifactId>
<version>${version.net.sourceforge.saxon.saxon}</version>
</dependency>

</dependencies>
</dependencyManagement>
</project>
6 changes: 3 additions & 3 deletions dookug-bom/dookug-bom-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<packaging>pom</packaging>

<properties>
<version.junit.jupiter>5.4.0</version.junit.jupiter>
<version.junit.jupiter>5.9.1</version.junit.jupiter>
<version.org.jboss.weld.weld-junit5>2.0.2.Final</version.org.jboss.weld.weld-junit5>
<version.org.mockito>2.24.0</version.org.mockito>
</properties>
Expand Down Expand Up @@ -44,13 +44,13 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-junit5</artifactId>
<version>${version.weld-junit5}</version>
<version>${version.org.jboss.weld.weld-junit5}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${version.mockito}</version>
<version>${version.org.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion dookug-bom/dookug-bom-wf/dookug-bom-wf-27/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<version.jackson.databind.core>2.13.4</version.jackson.databind.core>

<!-- from wildfly-microprofile import-->
<version.org.eclipse.microprofile.config>3.0.1</version.org.eclipse.microprofile.config>
<version.org.eclipse.microprofile.config>3.0.3</version.org.eclipse.microprofile.config>
<version.org.eclipse.microprofile.health>4.0</version.org.eclipse.microprofile.health>
<version.org.eclipse.microprofile.metrics>4.0</version.org.eclipse.microprofile.metrics>
<version.org.eclipse.microprofile.openapi>3.0</version.org.eclipse.microprofile.openapi>
Expand Down
2 changes: 1 addition & 1 deletion dookug-client/dookug-client-jee10/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<artifactId>dookug-client-jee10</artifactId>

<properties>
<version.hu.icellmobisoft.coffee>${version.hu.icellmobilsoft.coffee.ee10}</version.hu.icellmobisoft.coffee>
<version.hu.icellmobisoft.coffee>2.6.0</version.hu.icellmobisoft.coffee>
<version.org.jboss.resteasy>6.2.1.Final</version.org.jboss.resteasy>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,21 @@
*/
package hu.icellmobilsoft.dookug.client.rest;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;

import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifier;
import hu.icellmobilsoft.coffee.rest.log.annotation.LogSpecifiers;
import hu.icellmobilsoft.coffee.rest.log.annotation.enumeration.LogSpecifierTarget;
import hu.icellmobilsoft.dookug.api.dto.constants.ConfigKeys;
import hu.icellmobilsoft.dookug.api.url.DocumentGeneratePath;
import hu.icellmobilsoft.dookug.client.rest.jsonb.CustomJsonbContextResolver;
Expand All @@ -37,5 +47,23 @@
@RegisterRestClient(configKey = ConfigKeys.Client.DOOKUG_CLIENT_DOCUMENT)
@RegisterProvider(CustomJsonbContextResolver.class)
@Path(DocumentGeneratePath.INTERNAL_DOCUMENT_CONTENT)
public interface IDocumentContentInternalRest extends hu.icellmobilsoft.dookug.api.rest.document.IDocumentContentInternalRest, AutoCloseable {
public interface IDocumentContentInternalRest extends AutoCloseable {

/**
* REST interface definition for getting document content
*
* @param documentId
* document entity unique identifier
* @return Document content output stream
* @throws BaseException
* on error
*/
@GET
@Path(DocumentGeneratePath.ID)
@Produces(value = { MediaType.APPLICATION_OCTET_STREAM })
@LogSpecifiers({ @LogSpecifier(target = LogSpecifierTarget.RESPONSE, maxEntityLogSize = LogSpecifier.NO_LOG),
@LogSpecifier(target = LogSpecifierTarget.CLIENT_RESPONSE, maxEntityLogSize = LogSpecifier.NO_LOG) })
Response getDocumentContent(@PathParam(DocumentGeneratePath.PARAM_ID) @Parameter(name = DocumentGeneratePath.PARAM_ID,
description = "Generált dokumentum azonosító") String documentId) throws BaseException;

}
Loading
Loading