From 3368b39bbf19840221df9e4b3c0c863ea725aeda Mon Sep 17 00:00:00 2001 From: Lavender Shannon Date: Tue, 21 Mar 2023 17:33:30 -0500 Subject: [PATCH] Renamed :graphql to :server --- .github/workflows/docker-build.yml | 4 ++-- .github/workflows/release-upload.yml | 2 +- build.gradle | 2 +- docker/README.md | 2 +- graphql_compile_and_move.sh | 4 ++-- {graphql => server}/README.md | 6 +++--- {graphql => server}/build.gradle | 0 .../me/retrodaredevil/solarthing/rest/CommonProvider.java | 0 .../solarthing/rest/SolarThingGraphQLApplication.java | 0 .../me/retrodaredevil/solarthing/rest/WebConfiguration.java | 0 .../me/retrodaredevil/solarthing/rest/cache/CacheCalc.java | 0 .../solarthing/rest/cache/CacheController.java | 0 .../retrodaredevil/solarthing/rest/cache/CacheHandler.java | 0 .../solarthing/rest/cache/CacheHandlerProvider.java | 0 .../rest/cache/creators/BatteryRecordCacheNodeCreator.java | 0 .../solarthing/rest/cache/creators/CacheCreator.java | 0 .../ChargeControllerAccumulationCacheNodeCreator.java | 0 .../cache/creators/DefaultIdentificationCacheCreator.java | 0 .../rest/cache/creators/FXAccumulationCacheNodeCreator.java | 0 .../rest/cache/creators/IdentificationCacheNodeCreator.java | 0 .../solarthing/rest/command/CommandController.java | 0 .../solarthing/rest/command/CommandHandler.java | 0 .../solarthing/rest/command/CommandHandlerProvider.java | 0 .../solarthing/rest/command/CommandRequestResponse.java | 0 .../solarthing/rest/command/RestCommandConfig.java | 0 .../solarthing/rest/exceptions/DatabaseException.java | 0 .../solarthing/rest/exceptions/RestException.java | 0 .../rest/exceptions/UnexpectedResponseException.java | 0 .../solarthing/rest/graphql/AnnotationUtil.java | 0 .../solarthing/rest/graphql/GraphQLProvider.java | 0 .../solarthing/rest/graphql/JacksonResolverBuilder.java | 0 .../solarthing/rest/graphql/OutputSchemaMain.java | 0 .../solarthing/rest/graphql/PacketFinder.java | 0 .../solarthing/rest/graphql/SimpleQueryHandler.java | 0 .../rest/graphql/SolarThingAnnotatedResolverBuilder.java | 0 .../solarthing/rest/graphql/SolarThingExceptionHandler.java | 0 .../rest/graphql/SolarThingGraphQLExtensions.java | 0 .../rest/graphql/SolarThingGraphQLMetaService.java | 0 .../solarthing/rest/graphql/SolarThingResolverBuilder.java | 0 .../rest/graphql/SolarThingTypeInfoGenerator.java | 0 .../solarthing/rest/graphql/packets/FragmentFilter.java | 0 .../solarthing/rest/graphql/packets/IdentifierFilter.java | 0 .../solarthing/rest/graphql/packets/PacketFilter.java | 0 .../rest/graphql/packets/PacketFilterMultiplexer.java | 0 .../solarthing/rest/graphql/packets/PacketUtil.java | 0 .../rest/graphql/packets/UnknownChangePacketsFilter.java | 0 .../solarthing/rest/graphql/packets/nodes/DataNode.java | 0 .../solarthing/rest/graphql/packets/nodes/DataPoint.java | 0 .../solarthing/rest/graphql/packets/nodes/PacketNode.java | 0 .../solarthing/rest/graphql/packets/nodes/SimpleNode.java | 0 .../rest/graphql/packets/nodes/SimplePacketNode.java | 0 .../solarthing/rest/graphql/service/BasicPacketGetter.java | 0 .../solarthing/rest/graphql/service/LastPacketGetter.java | 0 .../solarthing/rest/graphql/service/PacketGetter.java | 0 .../rest/graphql/service/ReversedPacketGetter.java | 0 .../solarthing/rest/graphql/service/SchemaConstants.java | 0 .../rest/graphql/service/SolarThingGraphQLAlterService.java | 0 .../service/SolarThingGraphQLBatteryRecordService.java | 0 .../rest/graphql/service/SolarThingGraphQLDailyService.java | 0 .../rest/graphql/service/SolarThingGraphQLFXService.java | 0 .../graphql/service/SolarThingGraphQLLongTermService.java | 0 .../rest/graphql/service/SolarThingGraphQLService.java | 0 .../graphql/service/SolarThingGraphQLSolcastService.java | 0 .../rest/graphql/service/web/DatabaseAuthorization.java | 0 .../rest/graphql/service/web/DatabaseProvider.java | 0 .../rest/graphql/service/web/DefaultDatabaseProvider.java | 0 .../rest/graphql/service/web/ExistingCookieAuthHandler.java | 0 .../rest/graphql/service/web/SolarThingAdminService.java | 0 .../graphql/service/web/authorization/AuthorizedSender.java | 0 .../solarthing/rest/graphql/solcast/SolcastConfig.java | 0 .../src/main/resources/application.properties | 0 {graphql => server}/src/main/resources/log4j2-spring.xml | 0 .../solarthing/rest/graphql/GraphQLProviderTest.java | 0 .../retrodaredevil/solarthing/rest/graphql/OkHttpTest.java | 0 .../rest/graphql/service/web/DatabaseAuthorizationTest.java | 0 settings.gradle | 2 +- web/build.gradle | 2 +- 77 files changed, 12 insertions(+), 12 deletions(-) rename {graphql => server}/README.md (81%) rename {graphql => server}/build.gradle (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/SolarThingGraphQLApplication.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/WebConfiguration.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheCalc.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheController.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandler.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/BatteryRecordCacheNodeCreator.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/CacheCreator.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/ChargeControllerAccumulationCacheNodeCreator.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/DefaultIdentificationCacheCreator.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/FXAccumulationCacheNodeCreator.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/IdentificationCacheNodeCreator.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandController.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandler.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandRequestResponse.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/command/RestCommandConfig.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/DatabaseException.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/RestException.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/UnexpectedResponseException.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/AnnotationUtil.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/JacksonResolverBuilder.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/OutputSchemaMain.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/PacketFinder.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SimpleQueryHandler.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingAnnotatedResolverBuilder.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingExceptionHandler.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLExtensions.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLMetaService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingResolverBuilder.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingTypeInfoGenerator.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/FragmentFilter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/IdentifierFilter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilterMultiplexer.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketUtil.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/UnknownChangePacketsFilter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataNode.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataPoint.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/PacketNode.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimpleNode.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimplePacketNode.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/BasicPacketGetter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/LastPacketGetter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/PacketGetter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/ReversedPacketGetter.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SchemaConstants.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLAlterService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLBatteryRecordService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLDailyService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLFXService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLLongTermService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLSolcastService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorization.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseProvider.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DefaultDatabaseProvider.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/ExistingCookieAuthHandler.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/SolarThingAdminService.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/authorization/AuthorizedSender.java (100%) rename {graphql => server}/src/main/java/me/retrodaredevil/solarthing/rest/graphql/solcast/SolcastConfig.java (100%) rename {graphql => server}/src/main/resources/application.properties (100%) rename {graphql => server}/src/main/resources/log4j2-spring.xml (100%) rename {graphql => server}/src/test/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProviderTest.java (100%) rename {graphql => server}/src/test/java/me/retrodaredevil/solarthing/rest/graphql/OkHttpTest.java (100%) rename {graphql => server}/src/test/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorizationTest.java (100%) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index e2e49f55..fda34fc1 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies run: (cd web && npm install) - name: Build Boot Jar - run: ./gradlew graphql:bootJar + run: ./gradlew server:bootJar # https://github.com/marketplace/actions/docker-login - name: Log in to the Container registry @@ -57,7 +57,7 @@ jobs: context: . file: docker/solarthing-server/Dockerfile build-args: | - BOOT_JAR=graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar + BOOT_JAR=server/build/libs/server-0.0.1-SNAPSHOT.jar push: true platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml index fcacc6bc..c97d06d2 100644 --- a/.github/workflows/release-upload.yml +++ b/.github/workflows/release-upload.yml @@ -49,7 +49,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ github.event.release.upload_url }} - asset_path: ./graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar + asset_path: ./server/build/libs/server-0.0.1-SNAPSHOT.jar asset_name: solarthing-graphql-${{ needs.shared-outputs.outputs.version }}.jar asset_content_type: application/octet-stream release-docs: diff --git a/build.gradle b/build.gradle index 3e85749f..82984a6d 100644 --- a/build.gradle +++ b/build.gradle @@ -272,7 +272,7 @@ project(":serviceapi"){ annotationProcessor project(":process-annotations") } } -project(":graphql"){ +project(":server"){ apply plugin: 'java' dependencies { api project(":core") diff --git a/docker/README.md b/docker/README.md index 79a354ef..eb8eb522 100644 --- a/docker/README.md +++ b/docker/README.md @@ -8,5 +8,5 @@ So, the only Dockerfiles that should be used to build solarthing should be on th ```shell # run in solarthing root -docker build -f docker/solarthing-server/Dockerfile --build-arg BOOT_JAR=graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar --tag wildmountainfarms/solarthing-server:latest . +docker build -f docker/solarthing-server/Dockerfile --build-arg BOOT_JAR=server/build/libs/server-0.0.1-SNAPSHOT.jar --tag wildmountainfarms/solarthing-server:latest . ``` diff --git a/graphql_compile_and_move.sh b/graphql_compile_and_move.sh index b37927cc..91186303 100755 --- a/graphql_compile_and_move.sh +++ b/graphql_compile_and_move.sh @@ -2,6 +2,6 @@ BASEDIR=$(dirname "$0") cd "$BASEDIR" || exit 1 -./gradlew clean graphql:bootJar || exit 1 -other/scripts/set_snapshot.sh "solarthing-graphql" graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar || exit 1 +./gradlew clean server:bootJar || exit 1 +other/scripts/set_snapshot.sh "solarthing-graphql" server/build/libs/server-0.0.1-SNAPSHOT.jar || exit 1 echo "Compiled and moved graphql boot jar successfully" diff --git a/graphql/README.md b/server/README.md similarity index 81% rename from graphql/README.md rename to server/README.md index 690d059e..b0c6e441 100644 --- a/graphql/README.md +++ b/server/README.md @@ -20,9 +20,9 @@ For grafana: https://github.com/fifemon/graphql-datasource For testing your skills/syntax: https://graphql.org/swapi-graphql or https://nhzvc.csb.app/ ### Compiling -Use `./gradlew graphql:bootJar` or [./graphql_compile_and_move.sh](../graphql_compile_and_move.sh) in the root directory. +Use `./gradlew server:bootJar` or [./graphql_compile_and_move.sh](../graphql_compile_and_move.sh) in the root directory. -Or `./gradlew graphql:bootRun` to run this +Or `./gradlew server:bootRun` to run this ### Future `Dockerfile` @@ -31,6 +31,6 @@ https://reflectoring.io/spring-boot-docker/ When we create a `Dockerfile` from the boot jar, we will want to extract its layers. ```shell -java -Djarmode=layertools -jar ../graphql/build/libs/graphql-0.0.1-SNAPSHOT.jar extract +java -Djarmode=layertools -jar ../server/build/libs/server-0.0.1-SNAPSHOT.jar extract # then copy the 4 folders to /app or something ``` diff --git a/graphql/build.gradle b/server/build.gradle similarity index 100% rename from graphql/build.gradle rename to server/build.gradle diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/SolarThingGraphQLApplication.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/SolarThingGraphQLApplication.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/SolarThingGraphQLApplication.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/SolarThingGraphQLApplication.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/WebConfiguration.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/WebConfiguration.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/WebConfiguration.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/WebConfiguration.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheCalc.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheCalc.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheCalc.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheCalc.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheController.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheController.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheController.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheController.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandler.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandler.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandler.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandler.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/BatteryRecordCacheNodeCreator.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/BatteryRecordCacheNodeCreator.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/BatteryRecordCacheNodeCreator.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/BatteryRecordCacheNodeCreator.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/CacheCreator.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/CacheCreator.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/CacheCreator.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/CacheCreator.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/ChargeControllerAccumulationCacheNodeCreator.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/ChargeControllerAccumulationCacheNodeCreator.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/ChargeControllerAccumulationCacheNodeCreator.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/ChargeControllerAccumulationCacheNodeCreator.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/DefaultIdentificationCacheCreator.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/DefaultIdentificationCacheCreator.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/DefaultIdentificationCacheCreator.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/DefaultIdentificationCacheCreator.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/FXAccumulationCacheNodeCreator.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/FXAccumulationCacheNodeCreator.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/FXAccumulationCacheNodeCreator.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/FXAccumulationCacheNodeCreator.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/IdentificationCacheNodeCreator.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/IdentificationCacheNodeCreator.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/IdentificationCacheNodeCreator.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/cache/creators/IdentificationCacheNodeCreator.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandController.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandController.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandController.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandController.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandler.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandler.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandler.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandler.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandRequestResponse.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandRequestResponse.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandRequestResponse.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandRequestResponse.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/RestCommandConfig.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/command/RestCommandConfig.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/command/RestCommandConfig.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/command/RestCommandConfig.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/DatabaseException.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/DatabaseException.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/DatabaseException.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/DatabaseException.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/RestException.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/RestException.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/RestException.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/RestException.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/UnexpectedResponseException.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/UnexpectedResponseException.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/UnexpectedResponseException.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/exceptions/UnexpectedResponseException.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/AnnotationUtil.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/AnnotationUtil.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/AnnotationUtil.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/AnnotationUtil.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/JacksonResolverBuilder.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/JacksonResolverBuilder.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/JacksonResolverBuilder.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/JacksonResolverBuilder.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/OutputSchemaMain.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/OutputSchemaMain.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/OutputSchemaMain.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/OutputSchemaMain.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/PacketFinder.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/PacketFinder.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/PacketFinder.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/PacketFinder.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SimpleQueryHandler.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SimpleQueryHandler.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SimpleQueryHandler.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SimpleQueryHandler.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingAnnotatedResolverBuilder.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingAnnotatedResolverBuilder.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingAnnotatedResolverBuilder.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingAnnotatedResolverBuilder.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingExceptionHandler.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingExceptionHandler.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingExceptionHandler.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingExceptionHandler.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLExtensions.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLExtensions.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLExtensions.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLExtensions.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLMetaService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLMetaService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLMetaService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingGraphQLMetaService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingResolverBuilder.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingResolverBuilder.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingResolverBuilder.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingResolverBuilder.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingTypeInfoGenerator.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingTypeInfoGenerator.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingTypeInfoGenerator.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/SolarThingTypeInfoGenerator.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/FragmentFilter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/FragmentFilter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/FragmentFilter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/FragmentFilter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/IdentifierFilter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/IdentifierFilter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/IdentifierFilter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/IdentifierFilter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilterMultiplexer.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilterMultiplexer.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilterMultiplexer.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketFilterMultiplexer.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketUtil.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketUtil.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketUtil.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/PacketUtil.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/UnknownChangePacketsFilter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/UnknownChangePacketsFilter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/UnknownChangePacketsFilter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/UnknownChangePacketsFilter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataNode.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataNode.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataNode.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataNode.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataPoint.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataPoint.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataPoint.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/DataPoint.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/PacketNode.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/PacketNode.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/PacketNode.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/PacketNode.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimpleNode.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimpleNode.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimpleNode.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimpleNode.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimplePacketNode.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimplePacketNode.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimplePacketNode.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/packets/nodes/SimplePacketNode.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/BasicPacketGetter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/BasicPacketGetter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/BasicPacketGetter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/BasicPacketGetter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/LastPacketGetter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/LastPacketGetter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/LastPacketGetter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/LastPacketGetter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/PacketGetter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/PacketGetter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/PacketGetter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/PacketGetter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/ReversedPacketGetter.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/ReversedPacketGetter.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/ReversedPacketGetter.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/ReversedPacketGetter.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SchemaConstants.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SchemaConstants.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SchemaConstants.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SchemaConstants.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLAlterService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLAlterService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLAlterService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLAlterService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLBatteryRecordService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLBatteryRecordService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLBatteryRecordService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLBatteryRecordService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLDailyService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLDailyService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLDailyService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLDailyService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLFXService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLFXService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLFXService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLFXService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLLongTermService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLLongTermService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLLongTermService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLLongTermService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLSolcastService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLSolcastService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLSolcastService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/SolarThingGraphQLSolcastService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorization.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorization.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorization.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorization.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseProvider.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseProvider.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseProvider.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DefaultDatabaseProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DefaultDatabaseProvider.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DefaultDatabaseProvider.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DefaultDatabaseProvider.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/ExistingCookieAuthHandler.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/ExistingCookieAuthHandler.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/ExistingCookieAuthHandler.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/ExistingCookieAuthHandler.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/SolarThingAdminService.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/SolarThingAdminService.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/SolarThingAdminService.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/SolarThingAdminService.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/authorization/AuthorizedSender.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/authorization/AuthorizedSender.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/authorization/AuthorizedSender.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/service/web/authorization/AuthorizedSender.java diff --git a/graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/solcast/SolcastConfig.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/solcast/SolcastConfig.java similarity index 100% rename from graphql/src/main/java/me/retrodaredevil/solarthing/rest/graphql/solcast/SolcastConfig.java rename to server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/solcast/SolcastConfig.java diff --git a/graphql/src/main/resources/application.properties b/server/src/main/resources/application.properties similarity index 100% rename from graphql/src/main/resources/application.properties rename to server/src/main/resources/application.properties diff --git a/graphql/src/main/resources/log4j2-spring.xml b/server/src/main/resources/log4j2-spring.xml similarity index 100% rename from graphql/src/main/resources/log4j2-spring.xml rename to server/src/main/resources/log4j2-spring.xml diff --git a/graphql/src/test/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProviderTest.java b/server/src/test/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProviderTest.java similarity index 100% rename from graphql/src/test/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProviderTest.java rename to server/src/test/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProviderTest.java diff --git a/graphql/src/test/java/me/retrodaredevil/solarthing/rest/graphql/OkHttpTest.java b/server/src/test/java/me/retrodaredevil/solarthing/rest/graphql/OkHttpTest.java similarity index 100% rename from graphql/src/test/java/me/retrodaredevil/solarthing/rest/graphql/OkHttpTest.java rename to server/src/test/java/me/retrodaredevil/solarthing/rest/graphql/OkHttpTest.java diff --git a/graphql/src/test/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorizationTest.java b/server/src/test/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorizationTest.java similarity index 100% rename from graphql/src/test/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorizationTest.java rename to server/src/test/java/me/retrodaredevil/solarthing/rest/graphql/service/web/DatabaseAuthorizationTest.java diff --git a/settings.gradle b/settings.gradle index 1c2ba41a..b0622c25 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ rootProject.name = 'solarthing' include 'core' include 'client' include 'serviceapi' -include 'graphql' +include 'server' include 'common' include 'process-annotations' include 'action-node' diff --git a/web/build.gradle b/web/build.gradle index a0e9bcef..8f76b540 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -16,7 +16,7 @@ task appNpmBuild(type: NpmTask) { } task generateCode(type: NpmTask) { args = ["run", "graphql:codegen"] - dependsOn(":graphql:generateSchema") + dependsOn(":server:generateSchema") } assemble.dependsOn(appNpmBuild)