Skip to content

Commit

Permalink
Merge pull request #42 from vividroyjeong/feature/frontend-dev
Browse files Browse the repository at this point in the history 
Feature/frontend dev
  • Loading branch information
@vividroyjeong
vividroyjeong authored Dec 11, 2024
2 parents 30f8084 + 775e96b commit 0ab4c2a
Show file tree
Hide file tree
Showing 95 changed files with 2,917 additions and 1,690 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,3 +240,4 @@ $RECYCLE.BIN/

# nohup logs
nohup.out
.quarkus
13 changes: 0 additions & 13 deletions .quarkus/cli/plugins/quarkus-cli-catalog.json
View file

This file was deleted.

60 changes: 37 additions & 23 deletions backend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,20 @@
<artifactId>jersey-common</artifactId>
<version>2.26</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${io.swagger.annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.1.12</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-flyway</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -143,9 +148,20 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-health</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.logging.logback</groupId>
<artifactId>quarkus-logging-logback</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -159,22 +175,22 @@
<version>4.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.datafaker</groupId>
<artifactId>datafaker</artifactId>
<version>2.2.0</version>
</dependency>
<!-- all dependencies below were automatically generated into
target/generated-sources/openapi/pom.xml
and copied here to build the generated code as part of the application.
-->
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<groupId>net.datafaker</groupId>
<artifactId>datafaker</artifactId>
<version>2.2.0</version>
<!-- excluded validation-api:1.1.0.Final due to fact that it doesn't
support TYPE_USE,
for this project used jakarta.validation-api -->
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
Expand All @@ -185,13 +201,11 @@
<artifactId>validation-api</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand All @@ -218,12 +232,12 @@
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey2-version}</version>
</dependency>
<!-- Base64 encoding that works in
both JVM and Android -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Base64 encoding that works in
both JVM and Android -->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
Expand All @@ -233,11 +247,11 @@
<artifactId>migbase64</artifactId>
<version>2.2</version>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
Expand Down Expand Up @@ -266,9 +280,9 @@
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${project.basedir}/src/main/resources/openapi/vdyp-file.swagger.yaml</inputSpec>
<inputSpec>${project.basedir}/src/main/resources/openapi/vdyp-file.swagger.yaml</inputSpec>
<generatorName>jaxrs-spec</generatorName>
<templateDirectory>${project.basedir}/src/main/resources/openapi/templates</templateDirectory>
<templateDirectory>${project.basedir}/src/main/resources/openapi/templates</templateDirectory>
<verbose>true</verbose>
<configOptions>
<library>quarkus</library>
Expand All @@ -282,7 +296,7 @@
<modelPackage>ca.bc.gov.nrs.vdyp.backend.v1.model</modelPackage>
<artifactId>vdyp-resource-layer</artifactId>
<artifactVersion>${project.version}</artifactVersion>
<disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
<disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
<groupId>${project.groupId}</groupId>
<parentGroupId>ca.bc.gov.nrs.vdyp.api.v1</parentGroupId>
<parentArtifactId>vdyp-backend</parentArtifactId>
Expand Down Expand Up @@ -351,7 +365,7 @@
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/openapi/src/gen/java</source>
<source>${project.build.directory}/generated-sources/openapi/src/gen/java</source>
</sources>
</configuration>
</execution>
Expand Down
42 changes: 42 additions & 0 deletions backend/src/main/java/ca/bc/gov/nrs/vdyp/backend/v1/api/HelpService.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package ca.bc.gov.nrs.vdyp.backend.v1.api;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import ca.bc.gov.nrs.vdyp.backend.v1.api.impl.exceptions.NotFoundException;
import ca.bc.gov.nrs.vdyp.backend.v1.gen.model.ParameterDetailsMessage;
import ca.bc.gov.nrs.vdyp.backend.v1.gen.responses.HelpResource;
import ca.bc.gov.nrs.vdyp.backend.v1.model.ParameterDetailsMessageBuilder;
Expand Down Expand Up @@ -487,6 +489,46 @@ public HelpResource helpGet(UriInfo uriInfo, SecurityContext securityContext) th
)
);

/* Additional Parameters supported by VDYP8 */

messageList.add(
ParameterDetailsMessageBuilder.build(
"selectedExecutionOptions.doEnableProgressLogging", //
"Enable Progress logging", //
"true if present", //
"Enables or disables the logging of progress messages during projections.", //
"false"
)
);

messageList.add(
ParameterDetailsMessageBuilder.build(
"selectedExecutionOptions.doEnableErrorLogging", //
"Enable Error logging", //
"true if present", //
"Enables or disables the logging of error messages during projections.", //
"false"
)
);

messageList.add(
ParameterDetailsMessageBuilder.build(
"selectedExecutionOptions.doEnableDebugLogging", //
"Enable Debug logging", //
"true if present", //
"Enables or disables the logging of debug messages during projections.", //
"false"
)
);

messageList.sort(new Comparator<ParameterDetailsMessage>() {

@Override
public int compare(ParameterDetailsMessage o1, ParameterDetailsMessage o2) {
return o1.getField().compareTo(o2.getField());
}
});

logger.info(">helpGet");

return HelpResource.of(uriInfo, messageList);
Expand Down
Loading

0 comments on commit 0ab4c2a

Please sign in to comment.