From b8caa3b7c9ee661ea9d2834273adc563bf590a1e Mon Sep 17 00:00:00 2001 From: Robinson Date: Fri, 2 Jul 2021 11:41:05 +0200 Subject: [PATCH] WIP JPMS --- .../dorkbox/network/EmptyClass.java | 13 +++--- .../dorkbox/network/aeron/EmptyClass.java | 15 +++---- .../network/connection/EmptyClass.java | 24 ++++++++++ .../network/connectionType/EmptyClass.java | 24 ++++++++++ .../network/coroutines/EmptyClass.java | 24 ++++++++++ .../network/exceptions/EmptyClass.java | 24 ++++++++++ .../dorkbox/network/handshake/EmptyClass.java | 24 ++++++++++ src9/dorkbox/network/ipFilter/EmptyClass.java | 24 ++++++++++ src9/dorkbox/network/ping/EmptyClass.java | 24 ++++++++++ src9/dorkbox/network/rmi/EmptyClass.java | 24 ++++++++++ .../network/rmi/messages/EmptyClass.java | 24 ++++++++++ .../network/serialization/EmptyClass.java | 24 ++++++++++ src9/dorkbox/network/storage/EmptyClass.java | 24 ++++++++++ .../network/storage/types/EmptyClass.java | 24 ++++++++++ src9/module-info.java | 44 +++++++++++++++++++ 15 files changed, 345 insertions(+), 15 deletions(-) rename src/dorkbox/network/rmi/messages/GlobalObjectCreateResponse.kt => src9/dorkbox/network/EmptyClass.java (60%) rename src/dorkbox/network/rmi/messages/GlobalObjectCreateRequest.kt => src9/dorkbox/network/aeron/EmptyClass.java (53%) create mode 100644 src9/dorkbox/network/connection/EmptyClass.java create mode 100644 src9/dorkbox/network/connectionType/EmptyClass.java create mode 100644 src9/dorkbox/network/coroutines/EmptyClass.java create mode 100644 src9/dorkbox/network/exceptions/EmptyClass.java create mode 100644 src9/dorkbox/network/handshake/EmptyClass.java create mode 100644 src9/dorkbox/network/ipFilter/EmptyClass.java create mode 100644 src9/dorkbox/network/ping/EmptyClass.java create mode 100644 src9/dorkbox/network/rmi/EmptyClass.java create mode 100644 src9/dorkbox/network/rmi/messages/EmptyClass.java create mode 100644 src9/dorkbox/network/serialization/EmptyClass.java create mode 100644 src9/dorkbox/network/storage/EmptyClass.java create mode 100644 src9/dorkbox/network/storage/types/EmptyClass.java create mode 100644 src9/module-info.java diff --git a/src/dorkbox/network/rmi/messages/GlobalObjectCreateResponse.kt b/src9/dorkbox/network/EmptyClass.java similarity index 60% rename from src/dorkbox/network/rmi/messages/GlobalObjectCreateResponse.kt rename to src9/dorkbox/network/EmptyClass.java index 8e98ae28..70c010db 100644 --- a/src/dorkbox/network/rmi/messages/GlobalObjectCreateResponse.kt +++ b/src9/dorkbox/network/EmptyClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 dorkbox, llc + * Copyright 2021 dorkbox, llc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.network.rmi.messages +package dorkbox.network; /** - * These use packed IDs, because both are REALLY shorts, but the JVM deals better with ints. - * - * @param callbackId (LEFT) to know which callback to use when the object is created - * @param rmiId (RIGHT) the Kryo interface class ID to create + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process */ -data class GlobalObjectCreateResponse(val packedIds: Int) : RmiMessage +public +class EmptyClass {} diff --git a/src/dorkbox/network/rmi/messages/GlobalObjectCreateRequest.kt b/src9/dorkbox/network/aeron/EmptyClass.java similarity index 53% rename from src/dorkbox/network/rmi/messages/GlobalObjectCreateRequest.kt rename to src9/dorkbox/network/aeron/EmptyClass.java index 0b347c5e..19a6aba4 100644 --- a/src/dorkbox/network/rmi/messages/GlobalObjectCreateRequest.kt +++ b/src9/dorkbox/network/aeron/EmptyClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 dorkbox, llc + * Copyright 2021 dorkbox, llc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.network.rmi.messages + +package dorkbox.network.aeron; /** - * These use packed IDs, because both are REALLY shorts, but the JVM deals better with ints. - * - * @param interfaceClassId (LEFT) the Kryo interface class ID to create - * @param callbackId (RIGHT) to know which callback to use when the object is created - * @param objectParameters the constructor parameters to create the object with + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process */ -data class GlobalObjectCreateRequest(val packedIds: Int, val objectParameters: Array?) : RmiMessage +public +class EmptyClass {} diff --git a/src9/dorkbox/network/connection/EmptyClass.java b/src9/dorkbox/network/connection/EmptyClass.java new file mode 100644 index 00000000..d438e7aa --- /dev/null +++ b/src9/dorkbox/network/connection/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.connection; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/connectionType/EmptyClass.java b/src9/dorkbox/network/connectionType/EmptyClass.java new file mode 100644 index 00000000..8e4809df --- /dev/null +++ b/src9/dorkbox/network/connectionType/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.connectionType; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/coroutines/EmptyClass.java b/src9/dorkbox/network/coroutines/EmptyClass.java new file mode 100644 index 00000000..68000ff2 --- /dev/null +++ b/src9/dorkbox/network/coroutines/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.coroutines; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/exceptions/EmptyClass.java b/src9/dorkbox/network/exceptions/EmptyClass.java new file mode 100644 index 00000000..2cd78903 --- /dev/null +++ b/src9/dorkbox/network/exceptions/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.exceptions; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/handshake/EmptyClass.java b/src9/dorkbox/network/handshake/EmptyClass.java new file mode 100644 index 00000000..a2b51880 --- /dev/null +++ b/src9/dorkbox/network/handshake/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.handshake; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/ipFilter/EmptyClass.java b/src9/dorkbox/network/ipFilter/EmptyClass.java new file mode 100644 index 00000000..01ed0637 --- /dev/null +++ b/src9/dorkbox/network/ipFilter/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.ipFilter; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/ping/EmptyClass.java b/src9/dorkbox/network/ping/EmptyClass.java new file mode 100644 index 00000000..59d54961 --- /dev/null +++ b/src9/dorkbox/network/ping/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.ping; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/rmi/EmptyClass.java b/src9/dorkbox/network/rmi/EmptyClass.java new file mode 100644 index 00000000..c000f9c6 --- /dev/null +++ b/src9/dorkbox/network/rmi/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.rmi; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/rmi/messages/EmptyClass.java b/src9/dorkbox/network/rmi/messages/EmptyClass.java new file mode 100644 index 00000000..eb000f33 --- /dev/null +++ b/src9/dorkbox/network/rmi/messages/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.rmi.messages; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/serialization/EmptyClass.java b/src9/dorkbox/network/serialization/EmptyClass.java new file mode 100644 index 00000000..d52cd627 --- /dev/null +++ b/src9/dorkbox/network/serialization/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.serialization; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/storage/EmptyClass.java b/src9/dorkbox/network/storage/EmptyClass.java new file mode 100644 index 00000000..ef832188 --- /dev/null +++ b/src9/dorkbox/network/storage/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.storage; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/dorkbox/network/storage/types/EmptyClass.java b/src9/dorkbox/network/storage/types/EmptyClass.java new file mode 100644 index 00000000..43bf7b34 --- /dev/null +++ b/src9/dorkbox/network/storage/types/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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 + * + * http://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. + */ + +package dorkbox.network.storage.types; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/module-info.java b/src9/module-info.java new file mode 100644 index 00000000..9522509d --- /dev/null +++ b/src9/module-info.java @@ -0,0 +1,44 @@ +module dorkbox.network { + exports dorkbox.network; + exports dorkbox.network.aeron; + exports dorkbox.network.connection; + exports dorkbox.network.connectionType; + exports dorkbox.network.coroutines; + exports dorkbox.network.exceptions; + exports dorkbox.network.handshake; + exports dorkbox.network.ipFilter; + exports dorkbox.network.ping; + exports dorkbox.network.rmi; + exports dorkbox.network.serialization; + exports dorkbox.network.storage; + exports dorkbox.network.storage.types; + + requires dorkbox.updates; + requires dorkbox.utilities; + requires dorkbox.netutil; + requires dorkbox.minlog; + requires dorkbox.serializers; + requires dorkbox.objectpool; + + requires chronicle.map; + requires net.jodah.typetools; + requires com.esotericsoftware.kryo; + requires com.esotericsoftware.reflectasm; + requires org.objenesis; + + requires lmdbjava; + + requires io.aeron.driver; + requires io.aeron.client; + requires org.agrona.core; + + + requires atomicfu.jvm; + requires kotlin.logging.jvm; + + requires kotlin.stdlib; + requires kotlin.stdlib.jdk7; + requires kotlinx.coroutines.core.jvm; + + requires java.base; +}