diff --git a/lib/jul b/lib/jul index fe327c5fcc..c0d488dfd7 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit fe327c5fcc3103551ae681718a5478054996163e +Subproject commit c0d488dfd7f2ee03141841798e83a45712273e73 diff --git a/lib/type b/lib/type index 771d852329..53bd7914a3 160000 --- a/lib/type +++ b/lib/type @@ -1 +1 @@ -Subproject commit 771d8523297218c27ab3e53749a0d8a835b44bf4 +Subproject commit 53bd7914a3ab7f52ac09dddca74bec2435b05e9f diff --git a/module/api/graphql/build.gradle.kts b/module/api/graphql/build.gradle.kts index 80b99dc315..cae93f347e 100644 --- a/module/api/graphql/build.gradle.kts +++ b/module/api/graphql/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("org.openbase.bco") - //id("org.springframework.boot") version "2.4.0" - //id("io.spring.dependency-management") version "1.0.11.RELEASE" + id("org.springframework.boot") version "2.6.0" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { @@ -10,16 +10,15 @@ dependencies { api("com.graphql-java-kickstart:graphql-spring-boot-starter:8.0.0") { exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat") } - api("io.reactivex:rxjava:1.3.8") - api("org.springframework.boot:spring-boot-starter-jetty:2.4.0") - api("org.springframework:spring-webflux:5.3.1") + api("org.springframework.boot:spring-boot-starter-jetty:2.6.0") + api("org.springframework.boot:spring-boot-starter-webflux:2.6.0") api("com.google.api.graphql:rejoiner:0.3.1") { exclude(group = "com.graphql-java", module = "graphql-java") } api("com.google.guava:guava:28.0-jre") api("net.javacrumbs.future-converter:future-converter-java8-guava:1.2.0") api("org.jmdns:jmdns:3.5.6") - api("io.reactivex.rxjava2:rxjava:2.2.20") + api("io.reactivex.rxjava2:rxjava:2.2.21") } description = "BCO GraphQL API" diff --git a/module/api/graphql/src/main/java/org/openbase/bco/api/graphql/subscriptions/BCOWebSocketConfig.java b/module/api/graphql/src/main/java/org/openbase/bco/api/graphql/subscriptions/BCOWebSocketConfig.java deleted file mode 100644 index c92751a98e..0000000000 --- a/module/api/graphql/src/main/java/org/openbase/bco/api/graphql/subscriptions/BCOWebSocketConfig.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.openbase.bco.api.graphql.subscriptions; - -/*- - * #%L - * BCO GraphQL API - * %% - * Copyright (C) 2020 openbase.org - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * . - * #L% - */ - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -import org.springframework.web.socket.config.annotation.WebSocketConfigurer; -import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; -import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor; - -// this is no longer used since subscriptions endpoints over websockets are just defined in the application.properties file -@Deprecated -@Configuration -@EnableWebSocket -public class BCOWebSocketConfig implements WebSocketConfigurer { - - @Override - public void registerWebSocketHandlers(WebSocketHandlerRegistry webSocketHandlerRegistry) { - webSocketHandlerRegistry.addHandler(new BCOWebSocketHandler(), "graphqlws") - .addInterceptors(new HttpSessionHandshakeInterceptor()); - } -} diff --git a/module/api/graphql/src/main/java/org/openbase/bco/api/graphql/subscriptions/BCOWebSocketHandler.java b/module/api/graphql/src/main/java/org/openbase/bco/api/graphql/subscriptions/BCOWebSocketHandler.java deleted file mode 100644 index 2e53df1fbb..0000000000 --- a/module/api/graphql/src/main/java/org/openbase/bco/api/graphql/subscriptions/BCOWebSocketHandler.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.openbase.bco.api.graphql.subscriptions; - -/*- - * #%L - * BCO GraphQL API - * %% - * Copyright (C) 2020 openbase.org - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * . - * #L% - */ - -import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.handler.TextWebSocketHandler; - -// this is no longer used since subscriptions endpoints over websockets are just defined in the application.properties file -@Deprecated -public class BCOWebSocketHandler extends TextWebSocketHandler { - - @Override - protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { - System.out.println("Got message: " + message.getPayload()); - } - - @Override - public void afterConnectionEstablished(WebSocketSession session) throws Exception { - super.afterConnectionEstablished(session); - - System.out.println("Connection Established"); - } -} diff --git a/module/api/graphql/src/main/resources/application.properties b/module/api/graphql/src/main/resources/application.properties index 852b78c300..2d4db6e545 100644 --- a/module/api/graphql/src/main/resources/application.properties +++ b/module/api/graphql/src/main/resources/application.properties @@ -23,12 +23,12 @@ server.port=13781 spring.main.banner-mode=off # SSL -server.ssl.key-store=classpath:dev-keystore.p12 -server.ssl.key-store-password=WrCqBj8WV/eeXZIW +#server.ssl.key-store=classpath:dev-keystore.p12 +#server.ssl.key-store-password=WrCqBj8WV/eeXZIW # JKS or PKCS12 -server.ssl.key-store-type=PKCS12 -server.ssl.key-alaias=basecubeone +#server.ssl.key-store-type=PKCS12 +#server.ssl.key-alaias=basecubeone graphql: diff --git a/module/app/util/src/main/java/org/openbase/bco/app/util/launch/BCOLauncher.java b/module/app/util/src/main/java/org/openbase/bco/app/util/launch/BCOLauncher.java index ff98db65d7..25d5495524 100644 --- a/module/app/util/src/main/java/org/openbase/bco/app/util/launch/BCOLauncher.java +++ b/module/app/util/src/main/java/org/openbase/bco/app/util/launch/BCOLauncher.java @@ -86,7 +86,7 @@ public static void main(final String[] args) { /** * API Launcher */ -// launcher.add(BcoApiGraphQlLauncher.class); + launcher.add(BcoApiGraphQlLauncher.class); /** * Configure dynamic Device Manager Launcher diff --git a/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AbstractUnitTransformationRegistryPlugin.java b/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AbstractUnitTransformationRegistryPlugin.java index b4f6b66c0e..d0fa01eb5c 100644 --- a/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AbstractUnitTransformationRegistryPlugin.java +++ b/module/registry/unit-registry/core/src/main/java/org/openbase/bco/registry/unit/core/plugin/AbstractUnitTransformationRegistryPlugin.java @@ -77,7 +77,7 @@ protected void verifyPublication(final Transform transformation, String targetFr if (transformation.equalsWithoutTime(GlobalTransformReceiver.getInstance().lookupTransform(targetFrame, sourceFrame, System.currentTimeMillis()))) { // was published if (!JPService.testMode() && JPService.verboseMode()) { - logger.info("Published " + targetFrame + " to " + sourceFrame); + logger.debug("Published " + targetFrame + " to " + sourceFrame); } return; } diff --git a/versions.properties b/versions.properties index 89e8836aab..1acd35f298 100644 --- a/versions.properties +++ b/versions.properties @@ -7,6 +7,22 @@ #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file +version.com.graphql-java..graphql-java-extended-scalars=17.0 +## # available=2018-10-05T23-44-12-5312ccd +## # available=2019-08-31T02-34-04-3decba9 +## # available=2021-03-30T00-21-22-0d32e2f-SNAPSHOT +## # available=2021-03-30T00-26-04-4e02150 +## # available=2021-03-30T02-07-32-573beab +## # available=2021-03-30T02-55-48-f03414a +## # available=2021-03-31T04-38-21-f03414a +## # available=2021-03-29T23-28-56-0d32e2f-SNAPSHOT +## # available=2021-04-09T04-01-28-f4f9cb9 +## # available=2021-06-29T01-19-32-8e19827 +## # available=2021-07-20T10-05-45-ac72af3 +## # available=2021-08-03T09-10-50-aff4d46 +## # available=2021-08-15T23-45-48-a9f6ec6 +## # available=2021-10-11T21-35-35-49138ff + version.org.openbase..jul.communication.controller=3.0-SNAPSHOT version.org.openbase..jul.communication.mqtt=3.0-SNAPSHOT