Skip to content
Open
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
43 changes: 22 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.18</version>
<version>3.3.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -35,21 +35,20 @@
<properties>
<apt-maven.version>1.1.3</apt-maven.version>
<docx4j.version>11.4.6</docx4j.version>
<firebase.version>8.1.0</firebase.version>
<graphql-starter.version>0.0.7</graphql-starter.version>
<firebase.version>9.2.0</firebase.version>
<graphql-starter.version>1.0.1</graphql-starter.version>
<google-search.version>v1-rev20230701-2.0.0</google-search.version>
<imgscalr.version>4.2</imgscalr.version>
<jacoco.version>0.8.7</jacoco.version>
<jakarta.activation>2.1.0</jakarta.activation>
<jakarta.xml>4.0.0</jakarta.xml>
<java.version>17</java.version>
<javassist.version>3.29.2-GA</javassist.version>
<jsoup.version>1.15.4</jsoup.version>
<oauth.version>3.8.1</oauth.version>
<openhtmltopdf.version>1.0.10</openhtmltopdf.version>
<reflection.version>0.10.2</reflection.version>
<slugify.version>3.0.4</slugify.version>
<twelvemonkeys.imageio>3.5</twelvemonkeys.imageio>
<twelvemonkeys.imageio>3.10.1</twelvemonkeys.imageio>
<querydsl.version>5.1.0</querydsl.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -99,15 +98,19 @@
<artifactId>openhtmltopdf-pdfbox</artifactId>
<version>${openhtmltopdf.version}</version>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${querydsl.version}</version>
<classifier>jakarta</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<version>${querydsl.version}</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId>
Expand All @@ -127,6 +130,7 @@
<groupId>com.twelvemonkeys.servlet</groupId>
<artifactId>servlet</artifactId>
<version>${twelvemonkeys.imageio}</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>io.leangen.graphql</groupId>
Expand Down Expand Up @@ -156,7 +160,7 @@
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
</dependency>
<!-- <dependency>
<!-- <dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
Expand Down Expand Up @@ -234,22 +238,19 @@
It will throw
an error because of different XML bind usages.
See:
https://stackoverflow.com/questions/52502189/java-11-package-javax-xml-bind-does-not-exist
https://stackoverflow.com/questions/52502189/java-11-package-jakarta-xml-bind-does-not-exist
-->
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jakarta.xml}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -327,7 +328,7 @@
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<groupId>jakarta.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
Expand Down
27 changes: 12 additions & 15 deletions src/main/java/app/milo/server/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@

import java.io.IOException;
import java.time.OffsetDateTime;
import java.util.List;
import java.util.Optional;
import java.util.TimeZone;

import javax.annotation.PostConstruct;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand All @@ -22,18 +18,19 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;

import com.fasterxml.jackson.databind.ObjectMapper;
import app.milo.server.core.error.ExceptionResolverInterceptor;
import app.milo.server.core.error.CustomExceptionHandler;
import app.milo.server.core.error.errorMessage.ErrorMessageService;
import app.milo.server.core.i18n.TranslationPreprocessor;
import app.milo.server.core.repository.CustomRepositoryFactoryBean;
import io.leangen.graphql.ExtensionProvider;
import io.leangen.graphql.GeneratorConfiguration;
import io.leangen.graphql.execution.ResolverInterceptorFactory;
import graphql.GraphQL;
import graphql.execution.AsyncExecutionStrategy;
import graphql.execution.AsyncSerialExecutionStrategy;
import graphql.schema.GraphQLSchema;
import io.leangen.graphql.metadata.strategy.value.ValueMapperFactory;
import io.leangen.graphql.metadata.strategy.value.jackson.JacksonValueMapper;
import io.leangen.graphql.metadata.strategy.value.jackson.JacksonValueMapperFactory;
import jakarta.annotation.PostConstruct;
import javassist.CannotCompileException;
import javassist.NotFoundException;

Expand Down Expand Up @@ -92,11 +89,11 @@ public ServletServerContainerFactoryBean createServletServerContainerFactoryBean
}

@Bean
public ExtensionProvider<GeneratorConfiguration, ResolverInterceptorFactory> test() {
return (c, r) -> {
r.add(params -> List.of(new ExceptionResolverInterceptor(errorMessageService)));
return r;
};
public GraphQL graphQL(GraphQLSchema schema)
{
return GraphQL.newGraphQL(schema)
.queryExecutionStrategy(new AsyncExecutionStrategy(new CustomExceptionHandler(errorMessageService)))
.mutationExecutionStrategy(new AsyncSerialExecutionStrategy(new CustomExceptionHandler(errorMessageService)))
.build();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import java.util.List;
import java.util.Optional;

import javax.naming.ServiceUnavailableException;

import org.springframework.stereotype.Component;
import app.milo.server.base.address.authorization.permissions.AddressAdminPermission;
import app.milo.server.core.base.CrudApi;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package app.milo.server.base.address.base;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import app.milo.server.base.address.suburb.SuburbEntity;
import app.milo.server.core.base.BaseEntity;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package app.milo.server.base.address.base;

import java.util.Optional;

import javax.naming.ServiceUnavailableException;

import org.springframework.stereotype.Service;

import com.fasterxml.jackson.databind.JsonNode;
import app.milo.server.base.address.suburb.SuburbService;
import app.milo.server.core.base.DataService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import java.util.Set;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import app.milo.server.base.address.base.AddressEntity;
import app.milo.server.core.base.BaseEntity;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

import java.util.Set;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import app.milo.server.base.adminFooter.item.translations.AdminFooterItemTranslatableEntity;
import app.milo.server.base.adminFooter.parent.AdminFooterParentEntity;
import app.milo.server.core.base.BaseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app.milo.server.base.adminFooter.item.translations;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import app.milo.server.base.adminFooter.item.AdminFooterItemEntity;
import app.milo.server.core.i18n.entities.TranslatableEntity;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package app.milo.server.base.adminFooter.parent;

import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import app.milo.server.base.adminFooter.item.AdminFooterItemEntity;
import app.milo.server.base.adminFooter.parent.translations.AdminFooterParentTranslatableEntity;
import app.milo.server.core.base.BaseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app.milo.server.base.adminFooter.parent.translations;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import app.milo.server.base.adminFooter.parent.AdminFooterParentEntity;
import app.milo.server.core.i18n.entities.TranslatableEntity;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package app.milo.server.base.analytics.rating;

import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
import jakarta.persistence.Column;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MappedSuperclass;
import app.milo.server.base.userContext.base.UserContextEntity;
import app.milo.server.core.base.BaseEntity;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package app.milo.server.base.cms.components.menuItem;

import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import app.milo.server.base.cms.components.menuItem.translations.MenuItemTranslatableEntity;
import app.milo.server.base.cms.components.page.base.PageEntity;
import app.milo.server.base.cms.components.plugin.PluginEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app.milo.server.base.cms.components.menuItem.translations;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import app.milo.server.base.cms.components.menuItem.MenuItemEntity;
import app.milo.server.core.i18n.entities.TranslatableEntity;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package app.milo.server.base.cms.components.page.attribute;

import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import app.milo.server.base.cms.components.page.attribute.translations.PageAttributeTranslatableEntity;
import app.milo.server.base.cms.components.page.attributeReference.PageAttributeReferenceEntity;
import app.milo.server.base.cms.components.page.attributeType.PageAttributeTypeEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app.milo.server.base.cms.components.page.attribute.translations;

import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity;
import app.milo.server.core.i18n.entities.TranslatableEntity;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package app.milo.server.base.cms.components.page.attributeReference;

import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity;
import app.milo.server.base.cms.components.plugin.PluginEntity;
import app.milo.server.core.base.BaseEntity;
Expand Down
Loading