diff --git a/LoadBalancerWeb/frontend/generated/flow/generated-flow-imports.d.ts b/LoadBalancerWeb/frontend/generated/flow/generated-flow-imports.d.ts deleted file mode 100644 index 693da49..0000000 --- a/LoadBalancerWeb/frontend/generated/flow/generated-flow-imports.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/LoadBalancerWeb/frontend/generated/flow/generated-flow-imports.js b/LoadBalancerWeb/frontend/generated/flow/generated-flow-imports.js deleted file mode 100644 index c2b32dd..0000000 --- a/LoadBalancerWeb/frontend/generated/flow/generated-flow-imports.js +++ /dev/null @@ -1,88 +0,0 @@ -import '@vaadin/common-frontend/ConnectionIndicator.js'; -import '@vaadin/polymer-legacy-adapter/style-modules.js'; -import '@vaadin/accordion/src/vaadin-accordion.js'; -import '@vaadin/details/src/vaadin-details.js'; -import '@vaadin/accordion/src/vaadin-accordion-panel.js'; -import '@vaadin/app-layout/src/vaadin-app-layout.js'; -import '@vaadin/button/src/vaadin-button.js'; -import 'Frontend/generated/jar-resources/buttonFunctions.js'; -import '@vaadin/app-layout/src/vaadin-drawer-toggle.js'; -import '@vaadin/avatar/src/vaadin-avatar.js'; -import '@vaadin/avatar-group/src/vaadin-avatar-group.js'; -import '@vaadin/checkbox/src/vaadin-checkbox.js'; -import '@vaadin/checkbox-group/src/vaadin-checkbox-group.js'; -import '@vaadin/combo-box/src/vaadin-combo-box.js'; -import 'Frontend/generated/jar-resources/flow-component-renderer.js'; -import 'Frontend/generated/jar-resources/comboBoxConnector.js'; -import '@vaadin/multi-select-combo-box/src/vaadin-multi-select-combo-box.js'; -import '@vaadin/confirm-dialog/src/vaadin-confirm-dialog.js'; -import '@vaadin/context-menu/src/vaadin-context-menu.js'; -import 'Frontend/generated/jar-resources/contextMenuConnector.js'; -import 'Frontend/generated/jar-resources/contextMenuTargetConnector.js'; -import '@vaadin/custom-field/src/vaadin-custom-field.js'; -import '@vaadin/date-picker/src/vaadin-date-picker.js'; -import 'Frontend/generated/jar-resources/datepickerConnector.js'; -import '@vaadin/date-time-picker/src/vaadin-date-time-picker.js'; -import '@vaadin/time-picker/src/vaadin-time-picker.js'; -import 'Frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js'; -import '@vaadin/dialog/src/vaadin-dialog.js'; -import 'Frontend/generated/jar-resources/dndConnector.js'; -import '@vaadin/field-highlighter/src/vaadin-field-highlighter.js'; -import '@vaadin/form-layout/src/vaadin-form-layout.js'; -import '@vaadin/form-layout/src/vaadin-form-item.js'; -import '@vaadin/grid/src/vaadin-grid-column-group.js'; -import '@vaadin/grid/src/vaadin-grid.js'; -import '@vaadin/grid/src/vaadin-grid-column.js'; -import '@vaadin/grid/src/vaadin-grid-sorter.js'; -import 'Frontend/generated/jar-resources/gridConnector.js'; -import '@vaadin/tooltip/src/vaadin-tooltip.js'; -import 'Frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js'; -import '@vaadin/icon/src/vaadin-icon.js'; -import '@vaadin/icons/vaadin-iconset.js'; -import '@vaadin/list-box/src/vaadin-list-box.js'; -import '@vaadin/item/src/vaadin-item.js'; -import '@vaadin/login/src/vaadin-login-form.js'; -import '@vaadin/login/src/vaadin-login-overlay.js'; -import 'Frontend/generated/jar-resources/menubarConnector.js'; -import '@vaadin/menu-bar/src/vaadin-menu-bar.js'; -import '@vaadin/message-input/src/vaadin-message-input.js'; -import 'Frontend/generated/jar-resources/messageListConnector.js'; -import '@vaadin/message-list/src/vaadin-message-list.js'; -import '@vaadin/notification/src/vaadin-notification.js'; -import '@vaadin/horizontal-layout/src/vaadin-horizontal-layout.js'; -import '@vaadin/scroller/src/vaadin-scroller.js'; -import '@vaadin/vertical-layout/src/vaadin-vertical-layout.js'; -import '@vaadin/progress-bar/src/vaadin-progress-bar.js'; -import '@vaadin/radio-group/src/vaadin-radio-button.js'; -import '@vaadin/radio-group/src/vaadin-radio-group.js'; -import '@vaadin/select/src/vaadin-select.js'; -import 'Frontend/generated/jar-resources/selectConnector.js'; -import 'Frontend/generated/jar-resources/tooltip.ts'; -import '@vaadin/side-nav/src/vaadin-side-nav.js'; -import '@vaadin/side-nav/src/vaadin-side-nav-item.js'; -import '@vaadin/split-layout/src/vaadin-split-layout.js'; -import '@vaadin/tabs/src/vaadin-tab.js'; -import '@vaadin/tabsheet/src/vaadin-tabsheet.js'; -import '@vaadin/tabs/src/vaadin-tabs.js'; -import 'Frontend/generated/jar-resources/vaadin-big-decimal-field.js'; -import '@vaadin/email-field/src/vaadin-email-field.js'; -import '@vaadin/integer-field/src/vaadin-integer-field.js'; -import '@vaadin/number-field/src/vaadin-number-field.js'; -import '@vaadin/password-field/src/vaadin-password-field.js'; -import '@vaadin/text-area/src/vaadin-text-area.js'; -import '@vaadin/text-field/src/vaadin-text-field.js'; -import 'Frontend/generated/jar-resources/lit-renderer.ts'; -import '@vaadin/grid/src/vaadin-grid-tree-toggle.js'; -import '@vaadin/upload/src/vaadin-upload.js'; -import '@vaadin/virtual-list/src/vaadin-virtual-list.js'; -import 'Frontend/generated/jar-resources/virtualListConnector.js'; -import '@vaadin/vaadin-lumo-styles/color-global.js'; -import '@vaadin/vaadin-lumo-styles/typography-global.js'; -import '@vaadin/vaadin-lumo-styles/sizing.js'; -import '@vaadin/vaadin-lumo-styles/spacing.js'; -import '@vaadin/vaadin-lumo-styles/style.js'; -import '@vaadin/vaadin-lumo-styles/vaadin-iconset.js'; -const loadOnDemand = (key) => { return Promise.resolve(0); } -window.Vaadin = window.Vaadin || {}; -window.Vaadin.Flow = window.Vaadin.Flow || {}; -window.Vaadin.Flow.loadOnDemand = loadOnDemand; \ No newline at end of file diff --git a/LoadBalancerWeb/frontend/generated/vaadin.ts b/LoadBalancerWeb/frontend/generated/vaadin.ts deleted file mode 100644 index 464e371..0000000 --- a/LoadBalancerWeb/frontend/generated/vaadin.ts +++ /dev/null @@ -1,5 +0,0 @@ -import './vaadin-featureflags.js'; - -import './index'; - -import 'Frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.js'; diff --git a/LoadBalancerWeb/settings.gradle b/LoadBalancerWeb/settings.gradle deleted file mode 100644 index f75968d..0000000 --- a/LoadBalancerWeb/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'LoadBalancerWeb' diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketInfoResponse.java b/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketInfoResponse.java deleted file mode 100644 index 628f191..0000000 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketInfoResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dragonestia.loadbalancer.web.repository.impl.response; - -import ru.dragonestia.loadbalancer.web.model.Bucket; - -public record BucketInfoResponse(Bucket bucket) {} diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketListResponse.java b/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketListResponse.java deleted file mode 100644 index 2cd2e09..0000000 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketListResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.dragonestia.loadbalancer.web.repository.impl.response; - -import ru.dragonestia.loadbalancer.web.model.dto.BucketDTO; - -import java.util.List; - -public record BucketListResponse(String node, List buckets) {} diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketUserListResponse.java b/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketUserListResponse.java deleted file mode 100644 index 22e054c..0000000 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketUserListResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.dragonestia.loadbalancer.web.repository.impl.response; - -import ru.dragonestia.loadbalancer.web.model.User; - -import java.util.List; - -public record BucketUserListResponse(int slots, int usedSlots, List users) {} diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeDetailsResponse.java b/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeDetailsResponse.java deleted file mode 100644 index 6311274..0000000 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeDetailsResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dragonestia.loadbalancer.web.repository.impl.response; - -import ru.dragonestia.loadbalancer.web.model.Node; - -public record NodeDetailsResponse(Node node) {} diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeListResponse.java b/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeListResponse.java deleted file mode 100644 index adcff14..0000000 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeListResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.dragonestia.loadbalancer.web.repository.impl.response; - -import ru.dragonestia.loadbalancer.web.model.Node; - -import java.util.List; - -public record NodeListResponse(List nodes) {} diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..62f3234 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,23 @@ +plugins { + id 'org.springframework.boot' version '3.1.5' + id 'io.spring.dependency-management' version '1.1.3' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' +} + +tasks.named('bootBuildImage') { + builder = 'paketobuildpacks/builder-jammy-base:latest' +} \ No newline at end of file diff --git a/LoadBalancerWeb/gradle/wrapper/gradle-wrapper.jar b/app/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from LoadBalancerWeb/gradle/wrapper/gradle-wrapper.jar rename to app/gradle/wrapper/gradle-wrapper.jar diff --git a/LoadBalancerWeb/gradle/wrapper/gradle-wrapper.properties b/app/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from LoadBalancerWeb/gradle/wrapper/gradle-wrapper.properties rename to app/gradle/wrapper/gradle-wrapper.properties diff --git a/LoadBalancerWeb/gradlew b/app/gradlew old mode 100755 new mode 100644 similarity index 100% rename from LoadBalancerWeb/gradlew rename to app/gradlew diff --git a/LoadBalancerWeb/gradlew.bat b/app/gradlew.bat similarity index 96% rename from LoadBalancerWeb/gradlew.bat rename to app/gradlew.bat index 6689b85..93e3f59 100644 --- a/LoadBalancerWeb/gradlew.bat +++ b/app/gradlew.bat @@ -1,92 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java b/app/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java similarity index 89% rename from src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java rename to app/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java index 8449373..ff6624a 100644 --- a/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java +++ b/app/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java @@ -6,6 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class LoadBalancerApplication { + public record Test(String text) {} + public static void main(String[] args) { SpringApplication.run(LoadBalancerApplication.class, args); } diff --git a/src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java b/app/src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java rename to app/src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java b/app/src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java rename to app/src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java rename to app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java b/app/src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java rename to app/src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java b/app/src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java rename to app/src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/model/Node.java b/app/src/main/java/ru/dragonestia/loadbalancer/model/Node.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/model/Node.java rename to app/src/main/java/ru/dragonestia/loadbalancer/model/Node.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/model/User.java b/app/src/main/java/ru/dragonestia/loadbalancer/model/User.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/model/User.java rename to app/src/main/java/ru/dragonestia/loadbalancer/model/User.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java b/app/src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java rename to app/src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java b/app/src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java rename to app/src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java b/app/src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java rename to app/src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java b/app/src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java rename to app/src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java b/app/src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java rename to app/src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java b/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java rename to app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java b/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java rename to app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java b/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java rename to app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java b/app/src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java rename to app/src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java b/app/src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java rename to app/src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/service/UserService.java b/app/src/main/java/ru/dragonestia/loadbalancer/service/UserService.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/service/UserService.java rename to app/src/main/java/ru/dragonestia/loadbalancer/service/UserService.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java b/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java rename to app/src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java b/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java rename to app/src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java b/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java rename to app/src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java diff --git a/src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java b/app/src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java similarity index 100% rename from src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java rename to app/src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java diff --git a/src/main/resources/application.properties b/app/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to app/src/main/resources/application.properties diff --git a/src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java b/app/src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java similarity index 100% rename from src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java rename to app/src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java diff --git a/app/src/test/java/ru/dragonestia/loadbalancer/service/BucketServiceTest.java b/app/src/test/java/ru/dragonestia/loadbalancer/service/BucketServiceTest.java new file mode 100644 index 0000000..3b573f9 --- /dev/null +++ b/app/src/test/java/ru/dragonestia/loadbalancer/service/BucketServiceTest.java @@ -0,0 +1,39 @@ +package ru.dragonestia.loadbalancer.service; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import ru.dragonestia.loadbalancer.model.Bucket; +import ru.dragonestia.loadbalancer.model.Node; +import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; +import ru.dragonestia.loadbalancer.model.type.SlotLimit; + +import java.util.HashMap; + +public class BucketServiceTest { + + private BucketService bucketService; + private HashMap bucketMap; + + @BeforeEach + void setup() { + bucketMap = new HashMap<>(); + bucketService = Mockito.mock(BucketService.class); + Mockito.doAnswer(invocation -> { + var bucket = invocation.getArgument(0, Bucket.class); + + return null; + }).when(bucketService).createBucket(Mockito.any(Bucket.class)); + } + + Node createNode() { + return new Node("test-node", LoadBalancingMethod.ROUND_ROBIN); + } + + @Test + void test() { + var node = createNode(); + + bucketService.createBucket(Bucket.create("test-bucket", node, SlotLimit.unlimited(), "")); + } +} diff --git a/build.gradle b/build.gradle index c91cb7a..e6167d3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,39 +1,14 @@ -plugins { - id 'java' - id 'org.springframework.boot' version '3.1.5' - id 'io.spring.dependency-management' version '1.1.3' -} +subprojects { + apply plugin: 'java' -group = 'ru.dragonestia' -version = '0.0.1-SNAPSHOT' + group = 'ru.dragonestia' + version = '0.0.1-SNAPSHOT' -java { - sourceCompatibility = '17' -} + repositories { + mavenCentral() + } -configurations { - compileOnly { - extendsFrom annotationProcessor + java { + sourceCompatibility = '17' } } - -repositories { - mavenCentral() -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-web' - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.security:spring-security-test' -} - -tasks.named('bootBuildImage') { - builder = 'paketobuildpacks/builder-jammy-base:latest' -} - -tasks.named('test') { - useJUnitPlatform() -} diff --git a/LoadBalancerWeb/.gitignore b/control-panel/.gitignore similarity index 100% rename from LoadBalancerWeb/.gitignore rename to control-panel/.gitignore diff --git a/LoadBalancerWeb/build.gradle b/control-panel/build.gradle similarity index 92% rename from LoadBalancerWeb/build.gradle rename to control-panel/build.gradle index 1ccdb4c..db0a944 100644 --- a/LoadBalancerWeb/build.gradle +++ b/control-panel/build.gradle @@ -1,13 +1,9 @@ plugins { - id 'java' id 'org.springframework.boot' version '3.1.5' id 'io.spring.dependency-management' version '1.1.3' id 'com.vaadin' version '24.2.2' } -group = 'ru.dragonestia' -version = '0.0.1-SNAPSHOT' - java { sourceCompatibility = '17' } diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/Flow.d.ts b/control-panel/frontend/generated/jar-resources/Flow.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/Flow.d.ts rename to control-panel/frontend/generated/jar-resources/Flow.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/Flow.js b/control-panel/frontend/generated/jar-resources/Flow.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/Flow.js rename to control-panel/frontend/generated/jar-resources/Flow.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/Flow.js.map b/control-panel/frontend/generated/jar-resources/Flow.js.map similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/Flow.js.map rename to control-panel/frontend/generated/jar-resources/Flow.js.map diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/FlowBootstrap.d.ts b/control-panel/frontend/generated/jar-resources/FlowBootstrap.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/FlowBootstrap.d.ts rename to control-panel/frontend/generated/jar-resources/FlowBootstrap.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/FlowBootstrap.js b/control-panel/frontend/generated/jar-resources/FlowBootstrap.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/FlowBootstrap.js rename to control-panel/frontend/generated/jar-resources/FlowBootstrap.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/FlowClient.d.ts b/control-panel/frontend/generated/jar-resources/FlowClient.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/FlowClient.d.ts rename to control-panel/frontend/generated/jar-resources/FlowClient.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/FlowClient.js b/control-panel/frontend/generated/jar-resources/FlowClient.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/FlowClient.js rename to control-panel/frontend/generated/jar-resources/FlowClient.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/buttonFunctions.js b/control-panel/frontend/generated/jar-resources/buttonFunctions.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/buttonFunctions.js rename to control-panel/frontend/generated/jar-resources/buttonFunctions.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/comboBoxConnector.js b/control-panel/frontend/generated/jar-resources/comboBoxConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/comboBoxConnector.js rename to control-panel/frontend/generated/jar-resources/comboBoxConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/contextMenuConnector.js b/control-panel/frontend/generated/jar-resources/contextMenuConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/contextMenuConnector.js rename to control-panel/frontend/generated/jar-resources/contextMenuConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/contextMenuTargetConnector.js b/control-panel/frontend/generated/jar-resources/contextMenuTargetConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/contextMenuTargetConnector.js rename to control-panel/frontend/generated/jar-resources/contextMenuTargetConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/datepickerConnector.js b/control-panel/frontend/generated/jar-resources/datepickerConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/datepickerConnector.js rename to control-panel/frontend/generated/jar-resources/datepickerConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/dnd-polyfill-loader.js b/control-panel/frontend/generated/jar-resources/dnd-polyfill-loader.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/dnd-polyfill-loader.js rename to control-panel/frontend/generated/jar-resources/dnd-polyfill-loader.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/dndConnector.js b/control-panel/frontend/generated/jar-resources/dndConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/dndConnector.js rename to control-panel/frontend/generated/jar-resources/dndConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/flow-component-directive.js b/control-panel/frontend/generated/jar-resources/flow-component-directive.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/flow-component-directive.js rename to control-panel/frontend/generated/jar-resources/flow-component-directive.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/flow-component-renderer.js b/control-panel/frontend/generated/jar-resources/flow-component-renderer.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/flow-component-renderer.js rename to control-panel/frontend/generated/jar-resources/flow-component-renderer.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/gridConnector.js b/control-panel/frontend/generated/jar-resources/gridConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/gridConnector.js rename to control-panel/frontend/generated/jar-resources/gridConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/index.d.ts b/control-panel/frontend/generated/jar-resources/index.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/index.d.ts rename to control-panel/frontend/generated/jar-resources/index.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/index.js b/control-panel/frontend/generated/jar-resources/index.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/index.js rename to control-panel/frontend/generated/jar-resources/index.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/index.js.map b/control-panel/frontend/generated/jar-resources/index.js.map similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/index.js.map rename to control-panel/frontend/generated/jar-resources/index.js.map diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/lit-renderer.ts b/control-panel/frontend/generated/jar-resources/lit-renderer.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/lit-renderer.ts rename to control-panel/frontend/generated/jar-resources/lit-renderer.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/menubarConnector.js b/control-panel/frontend/generated/jar-resources/menubarConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/menubarConnector.js rename to control-panel/frontend/generated/jar-resources/menubarConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/messageListConnector.js b/control-panel/frontend/generated/jar-resources/messageListConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/messageListConnector.js rename to control-panel/frontend/generated/jar-resources/messageListConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/selectConnector.js b/control-panel/frontend/generated/jar-resources/selectConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/selectConnector.js rename to control-panel/frontend/generated/jar-resources/selectConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/theme-util.js b/control-panel/frontend/generated/jar-resources/theme-util.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/theme-util.js rename to control-panel/frontend/generated/jar-resources/theme-util.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/tooltip.ts b/control-panel/frontend/generated/jar-resources/tooltip.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/tooltip.ts rename to control-panel/frontend/generated/jar-resources/tooltip.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-big-decimal-field.js b/control-panel/frontend/generated/jar-resources/vaadin-big-decimal-field.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-big-decimal-field.js rename to control-panel/frontend/generated/jar-resources/vaadin-big-decimal-field.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/License.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/License.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/License.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/License.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-eed3b794.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-eed3b794.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-eed3b794.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-eed3b794.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-heading-c0acdd6d.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-heading-c0acdd6d.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-heading-c0acdd6d.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-heading-c0acdd6d.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-panel-616e55d6.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-panel-616e55d6.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-panel-616e55d6.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-accordion-panel-616e55d6.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-app-layout-e56de2e9.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-app-layout-e56de2e9.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-app-layout-e56de2e9.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-app-layout-e56de2e9.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-avatar-7599297d.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-avatar-7599297d.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-avatar-7599297d.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-avatar-7599297d.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-big-decimal-field-e51def24.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-big-decimal-field-e51def24.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-big-decimal-field-e51def24.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-big-decimal-field-e51def24.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-828ebdea.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-828ebdea.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-828ebdea.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-828ebdea.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-row-c70d0c55.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-row-c70d0c55.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-row-c70d0c55.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-board-row-c70d0c55.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-button-2511ad84.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-button-2511ad84.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-button-2511ad84.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-button-2511ad84.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-chart-5192dc15.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-chart-5192dc15.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-chart-5192dc15.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-chart-5192dc15.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-4e68df64.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-4e68df64.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-4e68df64.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-4e68df64.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-group-a7c65bf2.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-group-a7c65bf2.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-group-a7c65bf2.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-checkbox-group-a7c65bf2.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-combo-box-96451ddd.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-combo-box-96451ddd.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-combo-box-96451ddd.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-combo-box-96451ddd.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-confirm-dialog-4d718829.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-confirm-dialog-4d718829.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-confirm-dialog-4d718829.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-confirm-dialog-4d718829.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-cookie-consent-46c09f8b.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-cookie-consent-46c09f8b.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-cookie-consent-46c09f8b.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-cookie-consent-46c09f8b.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-crud-8d161a22.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-crud-8d161a22.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-crud-8d161a22.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-crud-8d161a22.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-custom-field-42c85b9e.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-custom-field-42c85b9e.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-custom-field-42c85b9e.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-custom-field-42c85b9e.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-picker-f2001167.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-picker-f2001167.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-picker-f2001167.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-picker-f2001167.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-time-picker-c8c047a7.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-time-picker-c8c047a7.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-time-picker-c8c047a7.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-date-time-picker-c8c047a7.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-bf336660.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-bf336660.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-bf336660.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-bf336660.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-summary-351a1448.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-summary-351a1448.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-summary-351a1448.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-details-summary-351a1448.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-dialog-53253a08.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-dialog-53253a08.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-dialog-53253a08.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-dialog-53253a08.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-email-field-d7a35f04.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-email-field-d7a35f04.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-email-field-d7a35f04.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-email-field-d7a35f04.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-form-layout-47744b1d.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-form-layout-47744b1d.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-form-layout-47744b1d.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-form-layout-47744b1d.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-0a4791c2.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-0a4791c2.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-0a4791c2.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-0a4791c2.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-pro-ff415555.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-pro-ff415555.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-pro-ff415555.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-grid-pro-ff415555.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-horizontal-layout-3193943f.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-horizontal-layout-3193943f.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-horizontal-layout-3193943f.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-horizontal-layout-3193943f.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-icon-601f36ed.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-icon-601f36ed.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-icon-601f36ed.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-icon-601f36ed.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-integer-field-85078932.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-integer-field-85078932.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-integer-field-85078932.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-integer-field-85078932.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-list-box-d7a8433b.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-list-box-d7a8433b.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-list-box-d7a8433b.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-list-box-d7a8433b.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-form-638996c6.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-form-638996c6.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-form-638996c6.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-form-638996c6.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-overlay-f8a5db8a.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-overlay-f8a5db8a.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-overlay-f8a5db8a.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-login-overlay-f8a5db8a.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-map-d40a0116.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-map-d40a0116.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-map-d40a0116.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-map-d40a0116.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-menu-bar-3f5ab096.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-menu-bar-3f5ab096.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-menu-bar-3f5ab096.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-menu-bar-3f5ab096.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-input-996ac37c.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-input-996ac37c.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-input-996ac37c.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-input-996ac37c.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-list-70a435ba.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-list-70a435ba.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-list-70a435ba.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-message-list-70a435ba.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-multi-select-combo-box-a3373557.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-multi-select-combo-box-a3373557.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-multi-select-combo-box-a3373557.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-multi-select-combo-box-a3373557.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-notification-bd6eb776.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-notification-bd6eb776.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-notification-bd6eb776.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-notification-bd6eb776.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-number-field-cb3ee8b2.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-number-field-cb3ee8b2.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-number-field-cb3ee8b2.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-number-field-cb3ee8b2.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-password-field-d289cb18.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-password-field-d289cb18.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-password-field-d289cb18.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-password-field-d289cb18.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-progress-bar-309ecf1f.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-progress-bar-309ecf1f.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-progress-bar-309ecf1f.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-progress-bar-309ecf1f.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-radio-group-88b5afd8.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-radio-group-88b5afd8.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-radio-group-88b5afd8.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-radio-group-88b5afd8.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-rich-text-editor-8cd892f2.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-rich-text-editor-8cd892f2.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-rich-text-editor-8cd892f2.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-rich-text-editor-8cd892f2.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-scroller-35e68818.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-scroller-35e68818.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-scroller-35e68818.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-scroller-35e68818.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-select-df6e9947.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-select-df6e9947.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-select-df6e9947.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-select-df6e9947.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-ba80d91d.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-ba80d91d.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-ba80d91d.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-ba80d91d.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-item-34918f92.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-item-34918f92.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-item-34918f92.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-side-nav-item-34918f92.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-split-layout-80c92131.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-split-layout-80c92131.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-split-layout-80c92131.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-split-layout-80c92131.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-spreadsheet-59d8c5ef.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-spreadsheet-59d8c5ef.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-spreadsheet-59d8c5ef.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-spreadsheet-59d8c5ef.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tab-aaf32809.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tab-aaf32809.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tab-aaf32809.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tab-aaf32809.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabs-d9a5e24e.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabs-d9a5e24e.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabs-d9a5e24e.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabs-d9a5e24e.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabsheet-dd99ed9a.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabsheet-dd99ed9a.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabsheet-dd99ed9a.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-tabsheet-dd99ed9a.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-area-83627ebc.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-area-83627ebc.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-area-83627ebc.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-area-83627ebc.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-field-0b3db014.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-field-0b3db014.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-field-0b3db014.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-text-field-0b3db014.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-time-picker-715ec415.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-time-picker-715ec415.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-time-picker-715ec415.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-time-picker-715ec415.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-upload-d3c162ed.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-upload-d3c162ed.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-upload-d3c162ed.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-upload-d3c162ed.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-vertical-layout-ad4174c4.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-vertical-layout-ad4174c4.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-vertical-layout-ad4174c4.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-vertical-layout-ad4174c4.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-virtual-list-96896203.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-virtual-list-96896203.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-virtual-list-96896203.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/assets/vaadin-virtual-list-96896203.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/component-picker.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/component-picker.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/component-picker.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/component-picker.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/component-util.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/component-util.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/component-util.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/component-util.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/connection.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/connection.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/connection.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/connection.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/shim.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/shim.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/shim.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/shim.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/styles.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/styles.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/styles.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/styles.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/api.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/api.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/api.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/api.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/class-name-editor.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/class-name-editor.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/class-name-editor.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/class-name-editor.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-overlay-manager.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-overlay-manager.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-overlay-manager.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-overlay-manager.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-resolver.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-resolver.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-resolver.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/component-resolver.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/base-property-editor.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/base-property-editor.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/base-property-editor.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/base-property-editor.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/checkbox-property-editor.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/checkbox-property-editor.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/checkbox-property-editor.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/checkbox-property-editor.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-picker.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-picker.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-picker.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-picker.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-property-editor.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-property-editor.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-property-editor.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/color-property-editor.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/range-property-editor.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/range-property-editor.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/range-property-editor.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/range-property-editor.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/text-property-editor.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/text-property-editor.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/text-property-editor.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/editors/text-property-editor.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/property-list.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/property-list.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/property-list.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/property-list.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/scope-selector.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/scope-selector.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/scope-selector.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/components/scope-selector.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/detector.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/detector.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/detector.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/detector.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/editor.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/editor.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/editor.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/editor.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/history.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/history.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/history.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/history.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/icons.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/icons.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/icons.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/icons.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/defaults.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/defaults.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/defaults.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/defaults.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/generic.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/generic.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/generic.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/generic.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/presets.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/presets.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/presets.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/components/presets.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/model.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/model.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/model.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/model.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/registry.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/registry.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/registry.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/metadata/registry.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/model.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/model.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/model.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/model.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/preview.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/preview.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/preview.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/preview.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/styles.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/styles.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/styles.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/theme-editor/styles.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-info.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-info.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-info.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-info.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-log.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-log.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-log.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools-log.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.js b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.js rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.test.d.ts b/control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.test.d.ts similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.test.d.ts rename to control-panel/frontend/generated/jar-resources/vaadin-dev-tools/vaadin-dev-tools.test.d.ts diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js b/control-panel/frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js rename to control-panel/frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-mobile-drag-drop.js b/control-panel/frontend/generated/jar-resources/vaadin-mobile-drag-drop.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-mobile-drag-drop.js rename to control-panel/frontend/generated/jar-resources/vaadin-mobile-drag-drop.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-time-picker/helpers.js b/control-panel/frontend/generated/jar-resources/vaadin-time-picker/helpers.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-time-picker/helpers.js rename to control-panel/frontend/generated/jar-resources/vaadin-time-picker/helpers.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js b/control-panel/frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js rename to control-panel/frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js diff --git a/LoadBalancerWeb/frontend/generated/jar-resources/virtualListConnector.js b/control-panel/frontend/generated/jar-resources/virtualListConnector.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/jar-resources/virtualListConnector.js rename to control-panel/frontend/generated/jar-resources/virtualListConnector.js diff --git a/LoadBalancerWeb/frontend/generated/vaadin-featureflags.js b/control-panel/frontend/generated/vaadin-featureflags.js similarity index 100% rename from LoadBalancerWeb/frontend/generated/vaadin-featureflags.js rename to control-panel/frontend/generated/vaadin-featureflags.js diff --git a/LoadBalancerWeb/frontend/index.html b/control-panel/frontend/index.html similarity index 100% rename from LoadBalancerWeb/frontend/index.html rename to control-panel/frontend/index.html diff --git a/control-panel/gradle/wrapper/gradle-wrapper.jar b/control-panel/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7f93135 Binary files /dev/null and b/control-panel/gradle/wrapper/gradle-wrapper.jar differ diff --git a/control-panel/gradle/wrapper/gradle-wrapper.properties b/control-panel/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3fa8f86 --- /dev/null +++ b/control-panel/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/control-panel/gradlew b/control-panel/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/control-panel/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/control-panel/gradlew.bat b/control-panel/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/control-panel/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/LoadBalancerWebApplication.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplication.java similarity index 53% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/LoadBalancerWebApplication.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplication.java index 12ba999..d8bdb2f 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/LoadBalancerWebApplication.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplication.java @@ -1,12 +1,12 @@ -package ru.dragonestia.loadbalancer.web; +package ru.dragonestia.loadbalancer.cp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class LoadBalancerWebApplication { +public class LoadBalancerControlPanelApplication { public static void main(String[] args) { - SpringApplication.run(LoadBalancerWebApplication.class, args); + SpringApplication.run(LoadBalancerControlPanelApplication.class, args); } } diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/AddUsers.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/AddUsers.java similarity index 95% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/AddUsers.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/AddUsers.java index 0765435..1bd6096 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/AddUsers.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/AddUsers.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.component; +package ru.dragonestia.loadbalancer.cp.component; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.button.Button; @@ -12,8 +12,8 @@ import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextField; import lombok.Getter; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.User; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.User; import java.util.List; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/BucketList.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/BucketList.java similarity index 98% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/BucketList.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/BucketList.java index 43ea4a1..bd83f6e 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/BucketList.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/BucketList.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.component; +package ru.dragonestia.loadbalancer.cp.component; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; @@ -16,7 +16,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextField; import lombok.Setter; -import ru.dragonestia.loadbalancer.web.model.dto.BucketDTO; +import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; import java.util.List; import java.util.function.Consumer; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/NavPath.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NavPath.java similarity index 97% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/NavPath.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NavPath.java index ac0186b..4e13138 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/NavPath.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NavPath.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.component; +package ru.dragonestia.loadbalancer.cp.component; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/NodeList.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NodeList.java similarity index 97% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/NodeList.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NodeList.java index f4b56b4..b730c02 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/NodeList.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NodeList.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.component; +package ru.dragonestia.loadbalancer.cp.component; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; @@ -14,7 +14,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextField; import lombok.Setter; -import ru.dragonestia.loadbalancer.web.model.Node; +import ru.dragonestia.loadbalancer.cp.model.Node; import java.util.List; import java.util.function.Consumer; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/RegisterBucket.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterBucket.java similarity index 95% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/RegisterBucket.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterBucket.java index 1c118e4..8d51e25 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/RegisterBucket.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterBucket.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.component; +package ru.dragonestia.loadbalancer.cp.component; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.button.Button; @@ -13,9 +13,9 @@ import com.vaadin.flow.component.textfield.Autocomplete; import com.vaadin.flow.component.textfield.TextArea; import com.vaadin.flow.component.textfield.TextField; import org.springframework.lang.Nullable; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.Node; -import ru.dragonestia.loadbalancer.web.model.type.SlotLimit; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.loadbalancer.cp.model.type.SlotLimit; import java.util.function.Function; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/RegisterNode.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterNode.java similarity index 96% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/RegisterNode.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterNode.java index 76e3497..e0fa9c4 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/RegisterNode.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterNode.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.component; +package ru.dragonestia.loadbalancer.cp.component; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Unit; @@ -16,8 +16,8 @@ import com.vaadin.flow.component.textfield.Autocomplete; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.renderer.ComponentRenderer; import org.springframework.lang.Nullable; -import ru.dragonestia.loadbalancer.web.model.Node; -import ru.dragonestia.loadbalancer.web.model.type.LoadBalancingMethod; +import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.loadbalancer.cp.model.type.LoadBalancingMethod; import java.util.function.Function; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/UserList.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/UserList.java similarity index 90% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/UserList.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/UserList.java index 7ed11b9..8671834 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/component/UserList.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/UserList.java @@ -1,11 +1,11 @@ -package ru.dragonestia.loadbalancer.web.component; +package ru.dragonestia.loadbalancer.cp.component; import com.vaadin.flow.component.grid.ColumnTextAlign; import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.orderedlayout.VerticalLayout; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.User; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.User; import java.util.ArrayList; import java.util.List; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/config/RestApiConfig.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/RestApiConfig.java similarity index 92% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/config/RestApiConfig.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/RestApiConfig.java index 7af94c3..624f20b 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/config/RestApiConfig.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/RestApiConfig.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.config; +package ru.dragonestia.loadbalancer.cp.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.client.RestTemplateBuilder; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/config/ServerConfig.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/ServerConfig.java similarity index 89% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/config/ServerConfig.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/ServerConfig.java index 2678d52..cb8dba9 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/config/ServerConfig.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/ServerConfig.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.config; +package ru.dragonestia.loadbalancer.cp.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/Bucket.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Bucket.java similarity index 92% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/Bucket.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Bucket.java index dbaa7ef..1f66e83 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/Bucket.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Bucket.java @@ -1,11 +1,9 @@ -package ru.dragonestia.loadbalancer.web.model; +package ru.dragonestia.loadbalancer.cp.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AccessLevel; import lombok.Getter; -import lombok.RequiredArgsConstructor; -import ru.dragonestia.loadbalancer.web.model.type.SlotLimit; +import ru.dragonestia.loadbalancer.cp.model.type.SlotLimit; import java.net.URI; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/Node.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Node.java similarity index 81% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/Node.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Node.java index bae7df9..6c23b1c 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/Node.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Node.java @@ -1,7 +1,7 @@ -package ru.dragonestia.loadbalancer.web.model; +package ru.dragonestia.loadbalancer.cp.model; import lombok.NonNull; -import ru.dragonestia.loadbalancer.web.model.type.LoadBalancingMethod; +import ru.dragonestia.loadbalancer.cp.model.type.LoadBalancingMethod; import java.io.Serializable; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/User.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/User.java similarity index 90% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/User.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/User.java index 1f9d90c..1d2493a 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/User.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/User.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.model; +package ru.dragonestia.loadbalancer.cp.model; import lombok.NonNull; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/dto/BucketDTO.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/dto/BucketDTO.java similarity index 74% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/dto/BucketDTO.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/dto/BucketDTO.java index 05032e9..7f33a1d 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/dto/BucketDTO.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/dto/BucketDTO.java @@ -1,6 +1,6 @@ -package ru.dragonestia.loadbalancer.web.model.dto; +package ru.dragonestia.loadbalancer.cp.model.dto; -import ru.dragonestia.loadbalancer.web.model.Node; +import ru.dragonestia.loadbalancer.cp.model.Node; import java.net.URI; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/type/LoadBalancingMethod.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/LoadBalancingMethod.java similarity index 84% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/type/LoadBalancingMethod.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/LoadBalancingMethod.java index a92839f..a99b583 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/type/LoadBalancingMethod.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/LoadBalancingMethod.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.model.type; +package ru.dragonestia.loadbalancer.cp.model.type; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/type/SlotLimit.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/SlotLimit.java similarity index 88% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/type/SlotLimit.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/SlotLimit.java index c3f5320..0184b62 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/model/type/SlotLimit.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/SlotLimit.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.model.type; +package ru.dragonestia.loadbalancer.cp.model.type; import java.beans.Transient; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/BucketDetailsPage.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/BucketDetailsPage.java similarity index 91% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/BucketDetailsPage.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/BucketDetailsPage.java index 1a0dccd..dd1a556 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/BucketDetailsPage.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/BucketDetailsPage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.page; +package ru.dragonestia.loadbalancer.cp.page; import com.vaadin.flow.component.Html; import com.vaadin.flow.component.Unit; @@ -16,14 +16,14 @@ import com.vaadin.flow.router.BeforeEnterEvent; import com.vaadin.flow.router.BeforeEnterObserver; import com.vaadin.flow.router.Route; import org.springframework.beans.factory.annotation.Autowired; -import ru.dragonestia.loadbalancer.web.component.AddUsers; -import ru.dragonestia.loadbalancer.web.component.NavPath; -import ru.dragonestia.loadbalancer.web.component.UserList; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.Node; -import ru.dragonestia.loadbalancer.web.repository.BucketRepository; -import ru.dragonestia.loadbalancer.web.repository.NodeRepository; -import ru.dragonestia.loadbalancer.web.repository.UserRepository; +import ru.dragonestia.loadbalancer.cp.component.AddUsers; +import ru.dragonestia.loadbalancer.cp.component.NavPath; +import ru.dragonestia.loadbalancer.cp.component.UserList; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; +import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; +import ru.dragonestia.loadbalancer.cp.repository.UserRepository; @Route("/nodes/:nodeId/buckets/:bucketId") public class BucketDetailsPage extends VerticalLayout implements BeforeEnterObserver { diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/HomePage.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/HomePage.java similarity index 89% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/HomePage.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/HomePage.java index 904924d..1be3732 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/HomePage.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/HomePage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.page; +package ru.dragonestia.loadbalancer.cp.page; import com.vaadin.flow.component.html.H1; import com.vaadin.flow.component.html.Paragraph; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/NodeDetailsPage.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodeDetailsPage.java similarity index 87% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/NodeDetailsPage.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodeDetailsPage.java index 342ac85..ac9a7a1 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/NodeDetailsPage.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodeDetailsPage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.page; +package ru.dragonestia.loadbalancer.cp.page; import com.vaadin.flow.component.Html; import com.vaadin.flow.component.html.H2; @@ -13,13 +13,13 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import lombok.Getter; import org.springframework.beans.factory.annotation.Autowired; -import ru.dragonestia.loadbalancer.web.component.BucketList; -import ru.dragonestia.loadbalancer.web.component.NavPath; -import ru.dragonestia.loadbalancer.web.component.RegisterBucket; -import ru.dragonestia.loadbalancer.web.model.Node; -import ru.dragonestia.loadbalancer.web.model.dto.BucketDTO; -import ru.dragonestia.loadbalancer.web.repository.BucketRepository; -import ru.dragonestia.loadbalancer.web.repository.NodeRepository; +import ru.dragonestia.loadbalancer.cp.component.BucketList; +import ru.dragonestia.loadbalancer.cp.component.NavPath; +import ru.dragonestia.loadbalancer.cp.component.RegisterBucket; +import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; +import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; +import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; import java.util.List; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/NodesPage.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodesPage.java similarity index 85% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/NodesPage.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodesPage.java index e3b5c0e..48aa269 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/page/NodesPage.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodesPage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.page; +package ru.dragonestia.loadbalancer.cp.page; import com.vaadin.flow.component.html.Hr; import com.vaadin.flow.component.orderedlayout.VerticalLayout; @@ -7,10 +7,10 @@ import com.vaadin.flow.router.Route; import lombok.Getter; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import ru.dragonestia.loadbalancer.web.component.NavPath; -import ru.dragonestia.loadbalancer.web.component.NodeList; -import ru.dragonestia.loadbalancer.web.component.RegisterNode; -import ru.dragonestia.loadbalancer.web.repository.NodeRepository; +import ru.dragonestia.loadbalancer.cp.component.NavPath; +import ru.dragonestia.loadbalancer.cp.component.NodeList; +import ru.dragonestia.loadbalancer.cp.component.RegisterNode; +import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; @Log4j2 @Getter diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/BucketRepository.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/BucketRepository.java similarity index 61% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/BucketRepository.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/BucketRepository.java index 63a50a7..bf5c475 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/BucketRepository.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/BucketRepository.java @@ -1,8 +1,8 @@ -package ru.dragonestia.loadbalancer.web.repository; +package ru.dragonestia.loadbalancer.cp.repository; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.Node; -import ru.dragonestia.loadbalancer.web.model.dto.BucketDTO; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; import java.util.List; import java.util.Optional; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/NodeRepository.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/NodeRepository.java similarity index 70% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/NodeRepository.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/NodeRepository.java index 6b45f7c..1f8ca3a 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/NodeRepository.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/NodeRepository.java @@ -1,6 +1,6 @@ -package ru.dragonestia.loadbalancer.web.repository; +package ru.dragonestia.loadbalancer.cp.repository; -import ru.dragonestia.loadbalancer.web.model.Node; +import ru.dragonestia.loadbalancer.cp.model.Node; import java.util.List; import java.util.Optional; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/UserRepository.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/UserRepository.java similarity index 62% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/UserRepository.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/UserRepository.java index 01cdb9d..ce5711f 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/UserRepository.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/UserRepository.java @@ -1,7 +1,7 @@ -package ru.dragonestia.loadbalancer.web.repository; +package ru.dragonestia.loadbalancer.cp.repository; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.User; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.User; import java.util.Collection; import java.util.List; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/BucketRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/BucketRepositoryImpl.java similarity index 85% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/BucketRepositoryImpl.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/BucketRepositoryImpl.java index d451983..90e43b5 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/BucketRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/BucketRepositoryImpl.java @@ -1,16 +1,16 @@ -package ru.dragonestia.loadbalancer.web.repository.impl; +package ru.dragonestia.loadbalancer.cp.repository.impl; import com.vaadin.flow.spring.annotation.SpringComponent; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.web.client.HttpClientErrorException; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.Node; -import ru.dragonestia.loadbalancer.web.model.dto.BucketDTO; -import ru.dragonestia.loadbalancer.web.repository.BucketRepository; -import ru.dragonestia.loadbalancer.web.repository.impl.response.BucketInfoResponse; -import ru.dragonestia.loadbalancer.web.repository.impl.response.BucketListResponse; -import ru.dragonestia.loadbalancer.web.repository.impl.response.BucketRegisterResponse; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; +import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; +import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketInfoResponse; +import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketListResponse; +import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketRegisterResponse; import java.net.URI; import java.util.List; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/NodeRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/NodeRepositoryImpl.java similarity index 69% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/NodeRepositoryImpl.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/NodeRepositoryImpl.java index d733a89..eb3c462 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/NodeRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/NodeRepositoryImpl.java @@ -1,23 +1,17 @@ -package ru.dragonestia.loadbalancer.web.repository.impl; +package ru.dragonestia.loadbalancer.cp.repository.impl; import com.vaadin.flow.spring.annotation.SpringComponent; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; -import ru.dragonestia.loadbalancer.web.model.Node; -import ru.dragonestia.loadbalancer.web.repository.NodeRepository; -import ru.dragonestia.loadbalancer.web.repository.impl.response.NodeDetailsResponse; -import ru.dragonestia.loadbalancer.web.repository.impl.response.NodeListResponse; -import ru.dragonestia.loadbalancer.web.repository.impl.response.NodeRegisterResponse; +import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; +import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeDetailsResponse; +import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeListResponse; +import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeRegisterResponse; import java.net.URI; -import java.util.HashMap; import java.util.List; -import java.util.Objects; import java.util.Optional; -import java.util.function.Supplier; @Log4j2 @RequiredArgsConstructor diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/RestUtil.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/RestUtil.java similarity index 98% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/RestUtil.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/RestUtil.java index d208de1..3a81c55 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/RestUtil.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/RestUtil.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.web.repository.impl; +package ru.dragonestia.loadbalancer.cp.repository.impl; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/UserRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/UserRepositoryImpl.java similarity index 73% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/UserRepositoryImpl.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/UserRepositoryImpl.java index 2d0cc99..68ccecd 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/UserRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/UserRepositoryImpl.java @@ -1,13 +1,12 @@ -package ru.dragonestia.loadbalancer.web.repository.impl; +package ru.dragonestia.loadbalancer.cp.repository.impl; import com.vaadin.flow.spring.annotation.SpringComponent; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.springframework.web.client.HttpClientErrorException; -import ru.dragonestia.loadbalancer.web.model.Bucket; -import ru.dragonestia.loadbalancer.web.model.User; -import ru.dragonestia.loadbalancer.web.repository.UserRepository; -import ru.dragonestia.loadbalancer.web.repository.impl.response.BucketUserListResponse; +import ru.dragonestia.loadbalancer.cp.model.Bucket; +import ru.dragonestia.loadbalancer.cp.model.User; +import ru.dragonestia.loadbalancer.cp.repository.UserRepository; +import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketUserListResponse; import java.net.URI; import java.util.Collection; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketInfoResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketInfoResponse.java new file mode 100644 index 0000000..a886db8 --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketInfoResponse.java @@ -0,0 +1,5 @@ +package ru.dragonestia.loadbalancer.cp.repository.impl.response; + +import ru.dragonestia.loadbalancer.cp.model.Bucket; + +public record BucketInfoResponse(Bucket bucket) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketListResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketListResponse.java new file mode 100644 index 0000000..9c39d7d --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketListResponse.java @@ -0,0 +1,7 @@ +package ru.dragonestia.loadbalancer.cp.repository.impl.response; + +import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; + +import java.util.List; + +public record BucketListResponse(String node, List buckets) {} diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketRegisterResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketRegisterResponse.java similarity index 52% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketRegisterResponse.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketRegisterResponse.java index 8d90b4f..0c4f6a3 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/BucketRegisterResponse.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketRegisterResponse.java @@ -1,3 +1,3 @@ -package ru.dragonestia.loadbalancer.web.repository.impl.response; +package ru.dragonestia.loadbalancer.cp.repository.impl.response; public record BucketRegisterResponse(boolean success, String message) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketUserListResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketUserListResponse.java new file mode 100644 index 0000000..0b92d98 --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketUserListResponse.java @@ -0,0 +1,7 @@ +package ru.dragonestia.loadbalancer.cp.repository.impl.response; + +import ru.dragonestia.loadbalancer.cp.model.User; + +import java.util.List; + +public record BucketUserListResponse(int slots, int usedSlots, List users) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeDetailsResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeDetailsResponse.java new file mode 100644 index 0000000..78eff75 --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeDetailsResponse.java @@ -0,0 +1,5 @@ +package ru.dragonestia.loadbalancer.cp.repository.impl.response; + +import ru.dragonestia.loadbalancer.cp.model.Node; + +public record NodeDetailsResponse(Node node) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeListResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeListResponse.java new file mode 100644 index 0000000..7d6073e --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeListResponse.java @@ -0,0 +1,7 @@ +package ru.dragonestia.loadbalancer.cp.repository.impl.response; + +import ru.dragonestia.loadbalancer.cp.model.Node; + +import java.util.List; + +public record NodeListResponse(List nodes) {} diff --git a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeRegisterResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeRegisterResponse.java similarity index 52% rename from LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeRegisterResponse.java rename to control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeRegisterResponse.java index ae6bfe4..3aab40a 100644 --- a/LoadBalancerWeb/src/main/java/ru/dragonestia/loadbalancer/web/repository/impl/response/NodeRegisterResponse.java +++ b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeRegisterResponse.java @@ -1,3 +1,3 @@ -package ru.dragonestia.loadbalancer.web.repository.impl.response; +package ru.dragonestia.loadbalancer.cp.repository.impl.response; public record NodeRegisterResponse(boolean success, String message) {} diff --git a/LoadBalancerWeb/src/main/resources/application.properties b/control-panel/src/main/resources/application.properties similarity index 100% rename from LoadBalancerWeb/src/main/resources/application.properties rename to control-panel/src/main/resources/application.properties diff --git a/LoadBalancerWeb/src/main/resources/static/icon.png b/control-panel/src/main/resources/static/icon.png similarity index 100% rename from LoadBalancerWeb/src/main/resources/static/icon.png rename to control-panel/src/main/resources/static/icon.png diff --git a/LoadBalancerWeb/src/test/java/ru/dragonestia/loadbalancer/web/LoadBalancerWebApplicationTests.java b/control-panel/src/test/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplicationTests.java similarity index 64% rename from LoadBalancerWeb/src/test/java/ru/dragonestia/loadbalancer/web/LoadBalancerWebApplicationTests.java rename to control-panel/src/test/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplicationTests.java index 8301805..545af85 100644 --- a/LoadBalancerWeb/src/test/java/ru/dragonestia/loadbalancer/web/LoadBalancerWebApplicationTests.java +++ b/control-panel/src/test/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplicationTests.java @@ -1,10 +1,10 @@ -package ru.dragonestia.loadbalancer.web; +package ru.dragonestia.loadbalancer.cp; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class LoadBalancerWebApplicationTests { +class LoadBalancerControlPanelApplicationTests { @Test void contextLoads() { diff --git a/settings.gradle b/settings.gradle index 63f35ef..75872e9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,4 @@ rootProject.name = 'LoadBalancer' + +include 'app' +include 'control-panel'