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

OD-19152 Angel Dependencies upgrade #1326

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
SST-43 Upgrade Bootique to version 2.0
KeyrisXdSnow committed Jan 8, 2025
commit 49c9cdc728525cd763dd20aa161bfbd2e5402892
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ buildscript {
googleGuiceVersion = '4.2.2'
groovyVersion = '2.5.15'
bouncycastleVersion = '1.67'
bootiqueVersion = '1.2'
bootiqueVersion = '2.0'
cfxVersion = '3.3.5'
//latest jackson version 2.12.2 (no any conflicts with spring, see AbstractApplicationContext), same version jasper uses also
jacksonVersion = '2.12.2'
4 changes: 2 additions & 2 deletions selenium-test/build.gradle
Original file line number Diff line number Diff line change
@@ -62,12 +62,12 @@ task copyConfig(type: Copy) {
include 'logSetup.xml'
}
into "$rootDir/server/build"
def dbUrl = project.hasProperty('dbUrl') ? project.getProperty('dbUrl') : 'jdbc:mariadb://localhost/angel_selenium_test?user=root&password=11111111'
def dbUrl = project.hasProperty('dbUrl') ? project.getProperty('dbUrl') : 'jdbc:mariadb://localhost/angel_selenium_test'
expand(dbUrl: dbUrl)
}

task prepareTestDatabase(type: PrepareTestDatabase) {
databaseUrl = project.hasProperty('dbUrl') ? project.getProperty('dbUrl') : 'jdbc:mariadb://localhost/angel_selenium_test?user=root&password=11111111'
databaseUrl = project.hasProperty('dbUrl') ? project.getProperty('dbUrl') : 'jdbc:mariadb://localhost/angel_selenium_test'
dataSetDirectory = "$rootDir/selenium-test/src/test/resources/ish.oncourse.selenium.test"
}

7 changes: 6 additions & 1 deletion server-api/build.gradle
Original file line number Diff line number Diff line change
@@ -58,7 +58,12 @@ dependencies {
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"
api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"

api "io.bootique.jetty:bootique-jetty:$bootiqueVersion"
implementation ("io.bootique.jetty:bootique-jetty:$bootiqueVersion") {
exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
}
implementation "org.eclipse.jetty:jetty-servlets:$jettyVersion"
implementation "org.eclipse.jetty.http2:http2-server:$jettyVersion"
}

task swagger (type: Swagger) {
204 changes: 102 additions & 102 deletions server-api/src/main/groovy/ish/oncourse/server/api/ServerApiModule.groovy
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

package ish.oncourse.server.api

import com.google.inject.Binder
import io.bootique.di.Binder
import io.bootique.ConfigModule
import ish.oncourse.server.api.cxf.CXFModule
import ish.oncourse.server.api.v1.service.*
@@ -21,108 +21,108 @@ class ServerApiModule extends ConfigModule {

@Override
void configure(Binder binder) {
CXFModule.contributeResources(binder).addBinding().to(AccessApi)
CXFModule.contributeResources(binder).addBinding().to(AccountApi)
CXFModule.contributeResources(binder).addBinding().to(ApplicationApi)
CXFModule.contributeResources(binder).addBinding().to(ArticleProductApi)
CXFModule.contributeResources(binder).addBinding().to(AssessmentApi)
CXFModule.contributeResources(binder).addBinding().to(AssessmentSubmissionApi)
CXFModule.contributeResources(binder).addBinding().to(AuditApi)
CXFModule.contributeResources(binder).addBinding().to(AuthenticationApi)
CXFModule.contributeResources(binder).addBinding().to(AvetmissExportApi)

CXFModule.contributeResources(binder).addBinding().to(BankingApi)

CXFModule.contributeResources(binder).addBinding().to(CertificateApi)
CXFModule.contributeResources(binder).addBinding().to(ConcessionApi)
CXFModule.contributeResources(binder).addBinding().to(ContactApi)
CXFModule.contributeResources(binder).addBinding().to(ContactMergeApi)
CXFModule.contributeResources(binder).addBinding().to(ContactInsightApi)
CXFModule.contributeResources(binder).addBinding().to(ControlApi)
CXFModule.contributeResources(binder).addBinding().to(CorporatePassApi)
CXFModule.contributeResources(binder).addBinding().to(CourseApi)
CXFModule.contributeResources(binder).addBinding().to(CourseClassApi)
CXFModule.contributeResources(binder).addBinding().to(FacultyApi)
CXFModule.contributeResources(binder).addBinding().to(ExportApi)
CXFModule.contributeResources(binder).addBinding().to(CustomFieldApi)

CXFModule.contributeResources(binder).addBinding().to(DashboardApi)
CXFModule.contributeResources(binder).addBinding().to(DataCollectionApi)
CXFModule.contributeResources(binder).addBinding().to(DiscountApi)
CXFModule.contributeResources(binder).addBinding().to(DocumentApi)

CXFModule.contributeResources(binder).addBinding().to(EmailTemplateApi)
CXFModule.contributeResources(binder).addBinding().to(EnrolmentApi)
CXFModule.contributeResources(binder).addBinding().to(EntityApi)
CXFModule.contributeResources(binder).addBinding().to(ExportTemplateApi)

CXFModule.contributeResources(binder).addBinding().to(FilterApi)
CXFModule.contributeResources(binder).addBinding().to(FundingContractApi)
CXFModule.contributeResources(binder).addBinding().to(FundingUploadApi)

CXFModule.contributeResources(binder).addBinding().to(GradingApi)

CXFModule.contributeResources(binder).addBinding().to(HolidayApi)

CXFModule.contributeResources(binder).addBinding().to(IntegrationApi)
CXFModule.contributeResources(binder).addBinding().to(InvoiceApi)
CXFModule.contributeResources(binder).addBinding().to(ImportApi)

CXFModule.contributeResources(binder).addBinding().to(LeadApi)
CXFModule.contributeResources(binder).addBinding().to(MessageApi)
CXFModule.contributeResources(binder).addBinding().to(MembershipProductApi)
CXFModule.contributeResources(binder).addBinding().to(ModuleApi)

CXFModule.contributeResources(binder).addBinding().to(OutcomeApi)
CXFModule.contributeResources(binder).addBinding().to(ReportOverlayApi)

CXFModule.contributeResources(binder).addBinding().to(PaymentApi)
CXFModule.contributeResources(binder).addBinding().to(PaymentInApi)
CXFModule.contributeResources(binder).addBinding().to(PaymentOutApi)
CXFModule.contributeResources(binder).addBinding().to(PayrollApi)
CXFModule.contributeResources(binder).addBinding().to(PayslipApi)
CXFModule.contributeResources(binder).addBinding().to(PdfApi)
CXFModule.contributeResources(binder).addBinding().to(PdfTemplateApi)
CXFModule.contributeResources(binder).addBinding().to(PreferenceApi)
CXFModule.contributeResources(binder).addBinding().to(PriorLearningApi)
CXFModule.contributeResources(binder).addBinding().to(ProductItemApi)

CXFModule.contributeResources(binder).addBinding().to(QualificationApi)

CXFModule.contributeResources(binder).addBinding().to(RoomApi)
CXFModule.contributeResources(binder).addBinding().to(RoomValidationApi)

CXFModule.contributeResources(binder).addBinding().to(ScriptApi)
CXFModule.contributeResources(binder).addBinding().to(SiteApi)
CXFModule.contributeResources(binder).addBinding().to(SurveyApi)

CXFModule.contributeResources(binder).addBinding().to(TagApi)
CXFModule.contributeResources(binder).addBinding().to(TaxApi)
CXFModule.contributeResources(binder).addBinding().to(TransactionApi)
CXFModule.contributeResources(binder).addBinding().to(TutorRoleApi)

CXFModule.contributeResources(binder).addBinding().to(UserApi)
CXFModule.contributeResources(binder).addBinding().to(UserPreferenceApi)
CXFModule.contributeResources(binder).addBinding().to(UserRoleApi)

CXFModule.contributeResources(binder).addBinding().to(VoucherProductApi)

CXFModule.contributeResources(binder).addBinding().to(WaitingListApi)

CXFModule.contributeResources(binder).addBinding().to(TimetableApi)
CXFModule.contributeResources(binder).addBinding().to(FinalisePeriodApi)
CXFModule.contributeResources(binder).addBinding().to(NoteApi)
CXFModule.contributeResources(binder).addBinding().to(CourseClassTutorApi)
CXFModule.contributeResources(binder).addBinding().to(ClassCostApi)
CXFModule.contributeResources(binder).addBinding().to(AttendanceApi)
CXFModule.contributeResources(binder).addBinding().to(AssessmentClassApi)
CXFModule.contributeResources(binder).addBinding().to(SessionApi)
CXFModule.contributeResources(binder).addBinding().to(CheckoutApi)
CXFModule.contributeResources(binder).addBinding().to(EntityRelationTypeApi)
CXFModule.contributeResources(binder).addBinding().to(TokenApi)
CXFModule.contributeResources(binder).addBinding().to(LogsApi)
CXFModule.contributeResources(binder).add(AccessApi)
CXFModule.contributeResources(binder).add(AccountApi)
CXFModule.contributeResources(binder).add(ApplicationApi)
CXFModule.contributeResources(binder).add(ArticleProductApi)
CXFModule.contributeResources(binder).add(AssessmentApi)
CXFModule.contributeResources(binder).add(AssessmentSubmissionApi)
CXFModule.contributeResources(binder).add(AuditApi)
CXFModule.contributeResources(binder).add(AuthenticationApi)
CXFModule.contributeResources(binder).add(AvetmissExportApi)

CXFModule.contributeResources(binder).add(BankingApi)

CXFModule.contributeResources(binder).add(CertificateApi)
CXFModule.contributeResources(binder).add(ConcessionApi)
CXFModule.contributeResources(binder).add(ContactApi)
CXFModule.contributeResources(binder).add(ContactMergeApi)
CXFModule.contributeResources(binder).add(ContactInsightApi)
CXFModule.contributeResources(binder).add(ControlApi)
CXFModule.contributeResources(binder).add(CorporatePassApi)
CXFModule.contributeResources(binder).add(CourseApi)
CXFModule.contributeResources(binder).add(CourseClassApi)
CXFModule.contributeResources(binder).add(FacultyApi)
CXFModule.contributeResources(binder).add(ExportApi)
CXFModule.contributeResources(binder).add(CustomFieldApi)

CXFModule.contributeResources(binder).add(DashboardApi)
CXFModule.contributeResources(binder).add(DataCollectionApi)
CXFModule.contributeResources(binder).add(DiscountApi)
CXFModule.contributeResources(binder).add(DocumentApi)

CXFModule.contributeResources(binder).add(EmailTemplateApi)
CXFModule.contributeResources(binder).add(EnrolmentApi)
CXFModule.contributeResources(binder).add(EntityApi)
CXFModule.contributeResources(binder).add(ExportTemplateApi)

CXFModule.contributeResources(binder).add(FilterApi)
CXFModule.contributeResources(binder).add(FundingContractApi)
CXFModule.contributeResources(binder).add(FundingUploadApi)

CXFModule.contributeResources(binder).add(GradingApi)

CXFModule.contributeResources(binder).add(HolidayApi)

CXFModule.contributeResources(binder).add(IntegrationApi)
CXFModule.contributeResources(binder).add(InvoiceApi)
CXFModule.contributeResources(binder).add(ImportApi)

CXFModule.contributeResources(binder).add(LeadApi)
CXFModule.contributeResources(binder).add(MessageApi)
CXFModule.contributeResources(binder).add(MembershipProductApi)
CXFModule.contributeResources(binder).add(ModuleApi)

CXFModule.contributeResources(binder).add(OutcomeApi)
CXFModule.contributeResources(binder).add(ReportOverlayApi)

CXFModule.contributeResources(binder).add(PaymentApi)
CXFModule.contributeResources(binder).add(PaymentInApi)
CXFModule.contributeResources(binder).add(PaymentOutApi)
CXFModule.contributeResources(binder).add(PayrollApi)
CXFModule.contributeResources(binder).add(PayslipApi)
CXFModule.contributeResources(binder).add(PdfApi)
CXFModule.contributeResources(binder).add(PdfTemplateApi)
CXFModule.contributeResources(binder).add(PreferenceApi)
CXFModule.contributeResources(binder).add(PriorLearningApi)
CXFModule.contributeResources(binder).add(ProductItemApi)

CXFModule.contributeResources(binder).add(QualificationApi)

CXFModule.contributeResources(binder).add(RoomApi)
CXFModule.contributeResources(binder).add(RoomValidationApi)

CXFModule.contributeResources(binder).add(ScriptApi)
CXFModule.contributeResources(binder).add(SiteApi)
CXFModule.contributeResources(binder).add(SurveyApi)

CXFModule.contributeResources(binder).add(TagApi)
CXFModule.contributeResources(binder).add(TaxApi)
CXFModule.contributeResources(binder).add(TransactionApi)
CXFModule.contributeResources(binder).add(TutorRoleApi)

CXFModule.contributeResources(binder).add(UserApi)
CXFModule.contributeResources(binder).add(UserPreferenceApi)
CXFModule.contributeResources(binder).add(UserRoleApi)

CXFModule.contributeResources(binder).add(VoucherProductApi)

CXFModule.contributeResources(binder).add(WaitingListApi)

CXFModule.contributeResources(binder).add(TimetableApi)
CXFModule.contributeResources(binder).add(FinalisePeriodApi)
CXFModule.contributeResources(binder).add(NoteApi)
CXFModule.contributeResources(binder).add(CourseClassTutorApi)
CXFModule.contributeResources(binder).add(ClassCostApi)
CXFModule.contributeResources(binder).add(AttendanceApi)
CXFModule.contributeResources(binder).add(AssessmentClassApi)
CXFModule.contributeResources(binder).add(SessionApi)
CXFModule.contributeResources(binder).add(CheckoutApi)
CXFModule.contributeResources(binder).add(EntityRelationTypeApi)
CXFModule.contributeResources(binder).add(TokenApi)
CXFModule.contributeResources(binder).add(LogsApi)

//------
CXFModule.contributeFeatures(binder).addBinding().to(JAXRSBeanValidationFeature)
CXFModule.contributeFeatures(binder).add(JAXRSBeanValidationFeature)
}
}
Original file line number Diff line number Diff line change
@@ -11,14 +11,15 @@

package ish.oncourse.server.api.cxf

import com.google.inject.Inject
import javax.inject.Inject

import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.Produces
import javax.ws.rs.core.MediaType

class CXFDefaultService {

private CXFModuleConfig config

@Inject
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

package ish.oncourse.server.api.cxf

import com.google.inject.BindingAnnotation
import javax.inject.Qualifier

import java.lang.annotation.ElementType
import java.lang.annotation.Retention
@@ -20,7 +20,7 @@ import java.lang.annotation.Target

@Target([ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD])
@Retention(RetentionPolicy.RUNTIME)
@BindingAnnotation
@Qualifier
@interface CXFFeature {

}
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@

package ish.oncourse.server.api.cxf

import com.google.inject.Binder
import com.google.inject.Key
import com.google.inject.Provides
import com.google.inject.Singleton
import com.google.inject.multibindings.Multibinder
import io.bootique.ConfigModule
import io.bootique.config.ConfigurationFactory
import io.bootique.di.Binder
import io.bootique.di.Key
import io.bootique.di.Provides
import io.bootique.di.SetBuilder
import javax.inject.Singleton
import io.bootique.jetty.JettyModule
import io.bootique.jetty.MappedServlet
import org.apache.cxf.interceptor.LoggingInInterceptor
@@ -27,18 +27,18 @@ import javax.ws.rs.core.Application

class CXFModule extends ConfigModule {

static Multibinder<Object> contributeResources(Binder binder) {
return Multibinder.newSetBinder(binder, Key.get(Object.class, CXFResource))
static SetBuilder<Object> contributeResources(Binder binder) {
return binder.bindSet(Object.class, CXFResource.class)
}

static Multibinder<Object> contributeFeatures(Binder binder) {
return Multibinder.newSetBinder(binder, Key.get(Object.class, CXFFeature))
static SetBuilder<Object> contributeFeatures(Binder binder) {
return binder.bindSet(Object.class, CXFFeature.class)
}

@Override
void configure(Binder binder) {
JettyModule.extend(binder).addMappedServlet(Key.get(MappedServlet, CXFServlet))
contributeResources(binder).addBinding().to(CXFDefaultService)
contributeResources(binder).add(CXFDefaultService)
}

@CXFServlet
Original file line number Diff line number Diff line change
@@ -11,15 +11,13 @@

package ish.oncourse.server.api.cxf

import com.google.inject.Module
import io.bootique.di.BQModule
import io.bootique.BQModuleProvider

/**
* Created by akoira on 2/5/17.
*/
class CXFModuleProvider implements BQModuleProvider {

@Override
Module module() {
BQModule module() {
return new CXFModule()
}

Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

package ish.oncourse.server.api.cxf

import com.google.inject.BindingAnnotation
import javax.inject.Qualifier

import java.lang.annotation.ElementType
import java.lang.annotation.Retention
@@ -20,6 +20,6 @@ import java.lang.annotation.Target

@Target([ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD])
@Retention(RetentionPolicy.RUNTIME)
@BindingAnnotation
@Qualifier
@interface CXFResource {
}
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

package ish.oncourse.server.api.cxf

import com.google.inject.BindingAnnotation
import javax.inject.Qualifier

import java.lang.annotation.ElementType
import java.lang.annotation.Retention
@@ -20,6 +20,6 @@ import java.lang.annotation.Target

@Target([ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD])
@Retention(RetentionPolicy.RUNTIME)
@BindingAnnotation
@Qualifier
@interface CXFServlet {
}
Loading