This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch STABLE-4.2 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit cc72aa737842d4e294dc4f24597cbd491697d92f Author: Nikita Timofeev <[email protected]> AuthorDate: Thu Jul 7 17:21:50 2022 +0300 CAY-2743 Deprecate ROP --- .../cayenne/configuration/rop/client/ClientJettyHttp2Module.java | 6 ++++++ .../cayenne/configuration/rop/client/ClientJettyHttpModule.java | 6 ++++++ .../org/apache/cayenne/configuration/rop/client/ClientModule.java | 5 +++++ .../apache/cayenne/configuration/rop/client/ProtostuffModule.java | 6 ++++++ .../apache/cayenne/configuration/rop/server/ROPServerModule.java | 6 ++++++ 5 files changed, 29 insertions(+) diff --git a/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttp2Module.java b/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttp2Module.java index d8205a119..fc0f8414d 100644 --- a/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttp2Module.java +++ b/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttp2Module.java @@ -24,6 +24,8 @@ import org.apache.cayenne.di.Module; import org.apache.cayenne.remote.ClientConnection; import org.apache.cayenne.rop.JettyHttp2ClientConnectionProvider; import org.apache.cayenne.rop.http.JettyHttpROPConnector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is HTTP/2 implementation of ROP Client. @@ -36,8 +38,12 @@ import org.apache.cayenne.rop.http.JettyHttpROPConnector; */ public class ClientJettyHttp2Module implements Module { + private static final Logger logger = LoggerFactory.getLogger(ClientJettyHttp2Module.class); + @Override public void configure(Binder binder) { + logger.warn("Since 4.2 cayenne-client-jetty module was deprecated."); + binder.bind(ClientConnection.class).toProvider(JettyHttp2ClientConnectionProvider.class); } diff --git a/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttpModule.java b/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttpModule.java index 8ef81ba01..4e4b6679b 100644 --- a/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttpModule.java +++ b/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/ClientJettyHttpModule.java @@ -24,6 +24,8 @@ import org.apache.cayenne.di.Module; import org.apache.cayenne.remote.ClientConnection; import org.apache.cayenne.rop.JettyHttpClientConnectionProvider; import org.apache.cayenne.rop.http.JettyHttpROPConnector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is HTTP/1.1 implementation of ROP Client. @@ -32,8 +34,12 @@ import org.apache.cayenne.rop.http.JettyHttpROPConnector; */ public class ClientJettyHttpModule implements Module { + private static final Logger logger = LoggerFactory.getLogger(ClientJettyHttpModule.class); + @Override public void configure(Binder binder) { + logger.warn("Since 4.2 cayenne-client-jetty module was deprecated."); + binder.bind(ClientConnection.class).toProvider(JettyHttpClientConnectionProvider.class); } diff --git a/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java b/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java index ade6f722d..5415bb163 100644 --- a/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java +++ b/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java @@ -35,6 +35,8 @@ import org.apache.cayenne.rop.HttpClientConnectionProvider; import org.apache.cayenne.rop.ProxyRemoteService; import org.apache.cayenne.rop.ROPSerializationService; import org.apache.cayenne.rop.http.ClientHessianSerializationServiceProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A DI module containing all Cayenne ROP client runtime configurations. @@ -44,6 +46,8 @@ import org.apache.cayenne.rop.http.ClientHessianSerializationServiceProvider; */ public class ClientModule implements Module { + private static final Logger logger = LoggerFactory.getLogger(ClientModule.class); + /** * @since 4.0 */ @@ -52,6 +56,7 @@ public class ClientModule implements Module { @SuppressWarnings("deprecation") public void configure(Binder binder) { + logger.warn("Since 4.2 cayenne-client module was deprecated."); // Contribute always to create binding ServerModule.contributeProperties(binder); diff --git a/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java b/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java index 319cbc719..fcdd20260 100644 --- a/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java +++ b/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java @@ -22,6 +22,8 @@ import org.apache.cayenne.di.Binder; import org.apache.cayenne.di.Module; import org.apache.cayenne.rop.ROPSerializationService; import org.apache.cayenne.rop.protostuff.ProtostuffROPSerializationService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A DI module that uses Protostuff Object Graph Serialization as Cayenne {@link ROPSerializationService}. @@ -38,11 +40,15 @@ import org.apache.cayenne.rop.protostuff.ProtostuffROPSerializationService; */ public class ProtostuffModule implements Module { + private static final Logger logger = LoggerFactory.getLogger(ProtostuffModule.class); + public ProtostuffModule() { } @Override public void configure(Binder binder) { + logger.warn("Since 4.2 cayenne-protostuff module was deprecated."); + binder.bind(ROPSerializationService.class).to(ProtostuffROPSerializationService.class).inSingletonScope(); } } diff --git a/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModule.java b/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModule.java index 896ff89e4..dcbfd9d4c 100644 --- a/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModule.java +++ b/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModule.java @@ -30,6 +30,8 @@ import org.apache.cayenne.rop.ROPConstants; import org.apache.cayenne.rop.ROPSerializationService; import org.apache.cayenne.rop.ServerHessianSerializationServiceProvider; import org.apache.cayenne.rop.ServerHttpRemoteService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A DI module that defines services for the server-side of an ROP application based on @@ -39,6 +41,8 @@ import org.apache.cayenne.rop.ServerHttpRemoteService; */ public class ROPServerModule implements Module { + private static final Logger logger = LoggerFactory.getLogger(ROPServerModule.class); + protected Map<String, String> eventBridgeProperties; /** @@ -70,6 +74,8 @@ public class ROPServerModule implements Module { } public void configure(Binder binder) { + logger.warn("Since 4.2 cayenne-rop-server module was deprecated."); + contributeSerializationWhitelist(binder); MapBuilder<String> mapBuilder = contributeROPBridgeProperties(binder); if(eventBridgeProperties != null) {
