Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gen/javadoc #728

Draft
wants to merge 70 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
6629d18
Added javadoc
keiran-lawrey Aug 29, 2023
31b5e37
Added javadoc
keiran-lawrey Aug 29, 2023
f2493ce
Added javadoc 202307 (#720)
peter-lawrey Aug 30, 2023
19e6675
throw an IAE on a missing class alias (#721)
peter-lawrey Aug 31, 2023
50d39b9
Improve Java21 support
peter-lawrey Aug 15, 2023
720c1a8
Added javadoc and comments
keiran-lawrey Sep 20, 2023
898eebd
FIx a merge issue
peter-lawrey Sep 28, 2023
333eda5
Added javadoc and comments
keiran-lawrey Sep 20, 2023
d41da0d
Added javadoc and comments
keiran-lawrey Nov 15, 2023
cebde5f
Merge changes from develop
peter-lawrey Jan 5, 2024
acf17bf
remove @since
peter-lawrey Jan 5, 2024
e6507be
remove @since
peter-lawrey Jan 5, 2024
7568660
Updating to bom version 2.25ea17
Jan 18, 2024
fed7823
[maven-release-plugin] prepare release chronicle-wire-2.25ea6
Jan 18, 2024
2468043
[maven-release-plugin] prepare for next development iteration
Jan 18, 2024
3304ae6
Reverting back to bom version 2.25ea-SNAPSHOT
Jan 18, 2024
ad3b939
added a callback to channels to notify when a TCP/IP connection is cl…
RobAustin Jan 18, 2024
57dd5b4
Updating to bom version 2.25ea18
Jan 19, 2024
433d098
[maven-release-plugin] prepare release chronicle-wire-2.25ea7
Jan 19, 2024
f78f476
[maven-release-plugin] prepare for next development iteration
Jan 19, 2024
d5590c8
Reverting back to bom version 2.25ea-SNAPSHOT
Jan 19, 2024
9557829
Merged changes
peter-lawrey Mar 11, 2024
3478561
Throw UnsupportedOperationException on record class.
yevgenp Jan 18, 2024
17b2f97
Fix CSVWireTest. Deprecate unused methods.
yevgenp Jan 17, 2024
73bac1a
Add compiler options override support from system.properties.
yevgenp Jan 15, 2024
4122793
#797 Reproduce issue: JSONWire incorrectly handles nested collections
maxim-ponomarev Dec 25, 2023
08cbbd5
Add nested collection support.
yevgenp Jan 22, 2024
5f86db7
Update pom.xml (#817)
RobAustin Jan 29, 2024
db8bad9
Fix NotNull issue (#818)
tgd Jan 29, 2024
ffbbb5f
Roll to new parent pom (#820)
tgd Jan 30, 2024
c05c8c2
Updating parent POM (automated)
Feb 1, 2024
4db0750
Updating to bom version 2.25ea19
Feb 1, 2024
64ffc15
[maven-release-plugin] prepare release chronicle-wire-2.25ea8
Feb 1, 2024
40e90df
[maven-release-plugin] prepare for next development iteration
Feb 1, 2024
b267fea
Reverting back to bom version 2.25ea-SNAPSHOT
Feb 1, 2024
6640c4b
824 services cfg to yaml and back (#826)
peter-lawrey Feb 5, 2024
f1044fb
Added a @ShortText specifically designed to encode short strings. (#822)
peter-lawrey Feb 5, 2024
b44b7fc
Update binary compatibility
yevgenp Feb 6, 2024
cb80ec0
Use forkCount: 4 (#830)
peter-lawrey Feb 9, 2024
d953b9b
Use forkCount: 1 (#833)
peter-lawrey Feb 9, 2024
23832db
Updating to bom version 2.25ea23
Feb 9, 2024
86e643e
[maven-release-plugin] prepare release chronicle-wire-2.25ea9
Feb 9, 2024
38d9a8c
[maven-release-plugin] prepare for next development iteration
Feb 9, 2024
650a222
Reverting back to bom version 2.25ea-SNAPSHOT
Feb 9, 2024
3bbde21
Marshallable.copyTo should not validate destination object. Closes #837
JerryShea Feb 25, 2024
a77e8d1
Add subSequence parse to LongConverter - closes #835 (#836)
alamar Feb 26, 2024
f48265e
#444 minor fixes
Feb 26, 2024
718d0c8
fixed deprecation issues
Feb 27, 2024
6b1ce35
Flatten the call stack for Method Readers #841 (#842)
peter-lawrey Feb 29, 2024
e8cb0cb
Don't allow jdk.X packages to be loaded this way (#832)
peter-lawrey Feb 29, 2024
1872409
If compiled with Java 11, still work on Java 8. (#831)
peter-lawrey Feb 29, 2024
bcfb9d4
WireType.JSON_ONLY incorrectly parses nested maps #844 (#846)
peter-lawrey Feb 29, 2024
2a82371
Wire does not use overridden ClassLookup for Classes #840 (#845)
peter-lawrey Feb 29, 2024
b313350
Support copying between yaml and json (#847)
peter-lawrey Feb 29, 2024
2590f07
Updating to bom version 2.25ea29
Mar 4, 2024
79f196b
[maven-release-plugin] prepare release chronicle-wire-2.25ea10
Mar 4, 2024
0a567d1
[maven-release-plugin] prepare for next development iteration
Mar 4, 2024
05b3e3d
Reverting back to bom version 2.25ea-SNAPSHOT
Mar 4, 2024
1cbdb9f
Updating parent POM (automated)
Mar 4, 2024
5b5c327
Added javadoc
keiran-lawrey Aug 29, 2023
3d92100
Added javadoc and comments
keiran-lawrey Sep 20, 2023
e539fa5
Added javadoc and comments
keiran-lawrey Nov 15, 2023
ea5b264
remove @since
peter-lawrey Jan 5, 2024
64b1749
Merged changes
peter-lawrey Mar 11, 2024
85e2940
Reviewed some changes
peter-lawrey Mar 14, 2024
cf34562
Reviewed some changes
peter-lawrey Mar 14, 2024
5a9a3b5
# Conflicts:
peter-lawrey Mar 14, 2024
bfe3e8a
Merged with develop
peter-lawrey Mar 14, 2024
924c9e2
# Conflicts:
peter-lawrey Mar 14, 2024
fd22da9
Merged with develop
peter-lawrey Mar 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Empty file modified jlbh-test.sh
100755 → 100644
Empty file.
15 changes: 11 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>net.openhft</groupId>
<artifactId>java-parent-pom</artifactId>
<version>1.24.0</version>
<version>1.25.4</version>
<relativePath />
</parent>

<artifactId>chronicle-wire</artifactId>
<version>2.25ea6-SNAPSHOT</version>
<version>2.25ea11-SNAPSHOT</version>
<name>OpenHFT/Chronicle-Wire</name>
<description>Chronicle-Wire</description>
<packaging>bundle</packaging>
Expand All @@ -38,14 +38,20 @@
<compiler.argument>-Xlint:deprecation</compiler.argument>
<sonar.organization>openhft</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<!-- The parent POM defines this plugin and activates it in a profile. Unfortunately this plugin will generate
code at @NotNull call-sites that throws IllegalArgumentException rather than NullPointerException. This will
break various core tests. Chronicle have raised this issue before with the maintainers of the plugin. See:
https://github.com/osundblad/intellij-annotations-instrumenter-maven-plugin/issues/53
-->
<se.eris.notnull.instrument>false</se.eris.notnull.instrument>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>third-party-bom</artifactId>
<version>3.24.0</version>
<version>3.25.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -192,7 +198,7 @@
<configuration>
<referenceVersion>2.25ea0</referenceVersion>
<artifactsURI>https://teamcity.chronicle.software/repository/download</artifactsURI>
<binaryCompatibilityPercentageRequired>99.9</binaryCompatibilityPercentageRequired>
<binaryCompatibilityPercentageRequired>99.6</binaryCompatibilityPercentageRequired>
<extraOptions>
<extraOption>
<name>skip-internal-packages</name>
Expand All @@ -208,6 +214,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- required for Issue327Test.date -->
<systemPropertyVariables>
<user.timezone>UTC</user.timezone>
</systemPropertyVariables>
Expand Down
49 changes: 43 additions & 6 deletions src/main/java/net/openhft/chronicle/wire/AbstractAnyWire.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,45 @@
import java.util.function.Supplier;

/**
* A wire type than can be either
* <p>
* TextWire BinaryWire
* An abstract representation of a wire type that could be either {@code TextWire} or {@code BinaryWire}.
* This class provides a generic foundation for wire types that could shift between the two mentioned types
* based on the underlying acquisition logic.
*
* @author Rob Austin.
*/
@SuppressWarnings("rawtypes")
public abstract class AbstractAnyWire extends AbstractWire implements Wire {

@NotNull
protected final WireAcquisition wireAcquisition;

protected final WireAcquisition wireAcquisition; // Responsible for acquiring the actual wire type (TextWire or BinaryWire).

/**
* Constructs a new instance of {@code AbstractAnyWire} using the specified bytes and wire acquisition strategy.
*
* @param bytes The byte storage and manipulation object.
* @param wa The strategy to acquire the actual wire type.
*/
protected AbstractAnyWire(@NotNull Bytes<?> bytes, @NotNull WireAcquisition wa) {
super(bytes, false);
this.wireAcquisition = wa;
}

/**
* Retrieves the underlying wire, which could be either {@code TextWire} or {@code BinaryWire},
* based on the acquisition strategy.
*
* @return The underlying wire type.
*/
@Nullable
public Wire underlyingWire() {
return wireAcquisition.acquireWire();
}

/**
* Provides a supplier that indicates the type of the underlying wire.
*
* @return A supplier yielding the {@code WireType}.
*/
@NotNull
public Supplier<WireType> underlyingType() {
return wireAcquisition.underlyingType();
Expand Down Expand Up @@ -208,19 +225,39 @@ public String readingPeekYaml() {
return wireAcquisition.acquireWire().readingPeekYaml();
}

/**
* Represents an interface defining the strategy for acquiring and interacting with the underlying wire types.
*/
interface WireAcquisition {

/**
* @return the type of wire for example Text or Binary
* Provides a supplier indicating the type of the underlying wire, which could be either {@code TextWire} or {@code BinaryWire}.
*
* @return A supplier yielding the {@code WireType}.
*/
@NotNull
Supplier<WireType> underlyingType();

/**
* Retrieves the actual wire type which could be either {@code TextWire} or {@code BinaryWire}.
*
* @return The acquired wire type.
*/
@Nullable
Wire acquireWire();

/**
* Sets the class lookup mechanism for this wire acquisition.
*
* @param classLookup The class lookup mechanism to set.
*/
void classLookup(ClassLookup classLookup);

/**
* Retrieves the class lookup mechanism associated with this wire acquisition.
*
* @return The class lookup mechanism.
*/
@Nullable
ClassLookup classLookup();
}
Expand Down
Loading