Skip to content

Commit a4f0853

Browse files
committed
Fixed location of annotations
1 parent fe35bf3 commit a4f0853

File tree

17 files changed

+29
-33
lines changed

17 files changed

+29
-33
lines changed

phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ public DBNAllianceUserMessageXHEBuilder ()
806806
* @see #receiverParticipantID(IParticipantIdentifier)
807807
*/
808808
@NonNull
809-
public DBNAllianceUserMessageXHEBuilder payload (@NonNull final byte [] aXHEBytes)
809+
public DBNAllianceUserMessageXHEBuilder payload (final byte @NonNull [] aXHEBytes)
810810
{
811811
ValueEnforcer.notNull (aXHEBytes, "XHEBytes");
812812
m_aPayloadBytes = aXHEBytes;

phase4-dbnalliance-servlet/src/main/java/com/helger/phase4/dbnalliance/servlet/IPhase4DBNAllianceIncomingXHEHandlerSPI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public interface IPhase4DBNAllianceIncomingXHEHandlerSPI
6767
void handleIncomingXHE (@NonNull IAS4IncomingMessageMetadata aMessageMetadata,
6868
@NonNull HttpHeaderMap aHeaders,
6969
@NonNull Ebms3UserMessage aUserMessage,
70-
@NonNull byte [] aSBDBytes,
70+
byte @NonNull [] aSBDBytes,
7171
@NonNull XHE10XHEType aXHE,
7272
@NonNull DBNAllianceXHEData aDBNAllianceXHE,
7373
@NonNull IAS4IncomingMessageState aState,
@@ -97,6 +97,6 @@ void handleIncomingXHE (@NonNull IAS4IncomingMessageMetadata aMessageMetadata,
9797
void processAS4ResponseMessage (@NonNull final IAS4IncomingMessageMetadata aIncomingMessageMetadata,
9898
@NonNull final IAS4IncomingMessageState aIncomingState,
9999
@NonNull @Nonempty final String sResponseMessageID,
100-
@Nullable final byte [] aResponseBytes,
100+
final byte @Nullable [] aResponseBytes,
101101
final boolean bResponsePayloadIsAvailable);
102102
}

phase4-dbnalliance-servlet/src/main/java/com/helger/phase4/dbnalliance/servlet/Phase4DBNAllianceServletMessageProcessorSPI.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,8 @@ public EAS4CompressionMode getCompressionMode ()
149149
return m_eCompressionMode;
150150
}
151151

152-
@NonNull
153152
@ReturnsMutableObject
154-
public byte [] payloadBytes ()
153+
public byte @NonNull [] payloadBytes ()
155154
{
156155
return m_aPayloadBytes;
157156
}
@@ -791,7 +790,7 @@ public AS4SignalMessageProcessorResult processAS4SignalMessage (@NonNull final I
791790
public void processAS4ResponseMessage (@NonNull final IAS4IncomingMessageMetadata aMessageMetadata,
792791
@NonNull final IAS4IncomingMessageState aState,
793792
@NonNull @Nonempty final String sResponseMessageID,
794-
@Nullable final byte [] aResponseBytes,
793+
final byte @Nullable [] aResponseBytes,
795794
final boolean bResponsePayloadIsAvailable)
796795
{
797796
// Not used callback

phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpPullRequestBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public AbstractEuCtpPullRequestBuilder ()
6363
}
6464

6565
@NonNull
66-
public IMPLTYPE httpClientFactory (@Nullable final KeyStore aKeyStore, @Nullable final char [] aKeyPassword)
66+
public IMPLTYPE httpClientFactory (@Nullable final KeyStore aKeyStore, final char @Nullable [] aKeyPassword)
6767
throws GeneralSecurityException
6868
{
6969
return httpClientFactory (new Phase4EuCtpHttpClientSettings (aKeyStore, aKeyPassword));

phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected AbstractEuCtpUserMessageBuilder ()
8787
}
8888

8989
@NonNull
90-
public IMPLTYPE httpClientFactory (@Nullable final KeyStore aKeyStore, @Nullable final char [] aKeyPassword)
90+
public IMPLTYPE httpClientFactory (@Nullable final KeyStore aKeyStore, final char @Nullable [] aKeyPassword)
9191
throws GeneralSecurityException
9292
{
9393
return httpClientFactory (new Phase4EuCtpHttpClientSettings (aKeyStore, aKeyPassword));

phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettings.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ public class Phase4EuCtpHttpClientSettings extends HttpClientSettings
4444
public static final Timeout DEFAULT_EUCTP_CONNECT_TIMEOUT = Timeout.ofSeconds (5);
4545
public static final Timeout DEFAULT_EUCTP_RESPONSE_TIMEOUT = Timeout.ofSeconds (100);
4646

47-
public Phase4EuCtpHttpClientSettings (@Nullable final KeyStore aKeyStore, @Nullable final char [] aKeyPassword)
47+
public Phase4EuCtpHttpClientSettings (@Nullable final KeyStore aKeyStore, final char @Nullable [] aKeyPassword)
4848
throws GeneralSecurityException
4949
{
50-
SSLContextBuilder aSSLContextBuilder = SSLContexts.custom ().setProtocol (ETLSVersion.TLS_12.getID ());
51-
50+
final SSLContextBuilder aSSLContextBuilder = SSLContexts.custom ().setProtocol (ETLSVersion.TLS_12.getID ());
5251
if (aKeyStore != null && aKeyPassword != null)
5352
{
54-
aSSLContextBuilder = aSSLContextBuilder.loadKeyMaterial (aKeyStore, aKeyPassword);
53+
aSSLContextBuilder.loadKeyMaterial (aKeyStore, aKeyPassword);
5554
}
5655

5756
final SSLContext aSSLContext = aSSLContextBuilder.build ();

phase4-hredelivery-client/src/main/java/com/helger/phase4/hredelivery/Phase4HREdeliverySender.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ public HREDeliveryUserMessageBuilder payload (@NonNull final Element aPayloadEle
10591059
* @return this for chaining
10601060
*/
10611061
@NonNull
1062-
public HREDeliveryUserMessageBuilder payload (@NonNull final byte [] aPayloadBytes)
1062+
public HREDeliveryUserMessageBuilder payload (final byte @NonNull [] aPayloadBytes)
10631063
{
10641064
ValueEnforcer.notNull (aPayloadBytes, "PayloadBytes");
10651065
m_aPayloadElement = null;
@@ -1306,7 +1306,7 @@ public HREDeliveryUserMessageSBDHBuilder ()
13061306
* @see #processID(IProcessIdentifier)
13071307
*/
13081308
@NonNull
1309-
public HREDeliveryUserMessageSBDHBuilder payload (@NonNull final byte [] aSBDHBytes)
1309+
public HREDeliveryUserMessageSBDHBuilder payload (final byte @NonNull [] aSBDHBytes)
13101310
{
13111311
ValueEnforcer.notNull (aSBDHBytes, "SBDHBytes");
13121312
m_aPayloadBytes = aSBDHBytes;

phase4-hredelivery-servlet/src/main/java/com/helger/phase4/hredelivery/servlet/IPhase4HREDeliveryIncomingSBDHandlerSPI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public interface IPhase4HREDeliveryIncomingSBDHandlerSPI
7474
void handleIncomingSBD (@NonNull IAS4IncomingMessageMetadata aMessageMetadata,
7575
@NonNull HttpHeaderMap aHeaders,
7676
@NonNull Ebms3UserMessage aUserMessage,
77-
@NonNull byte [] aSBDBytes,
77+
byte @NonNull [] aSBDBytes,
7878
@NonNull StandardBusinessDocument aSBD,
7979
@NonNull HREDeliverySBDHData aHREDeliverySBD,
8080
@NonNull IDocumentTypeIdentifier aDocTypeID,
@@ -105,7 +105,7 @@ void handleIncomingSBD (@NonNull IAS4IncomingMessageMetadata aMessageMetadata,
105105
default void processAS4ResponseMessage (@NonNull final IAS4IncomingMessageMetadata aIncomingMessageMetadata,
106106
@NonNull final IAS4IncomingMessageState aIncomingState,
107107
@NonNull @Nonempty final String sResponseMessageID,
108-
@Nullable final byte [] aResponseBytes,
108+
final byte @Nullable [] aResponseBytes,
109109
final boolean bResponsePayloadIsAvailable)
110110
{}
111111
}

phase4-hredelivery-servlet/src/main/java/com/helger/phase4/hredelivery/servlet/Phase4HREDeliveryServletMessageProcessorSPI.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,8 @@ public EAS4CompressionMode getCompressionMode ()
147147
return m_eCompressionMode;
148148
}
149149

150-
@NonNull
151150
@ReturnsMutableObject
152-
public byte [] payloadBytes ()
151+
public byte @NonNull [] payloadBytes ()
153152
{
154153
return m_aPayloadBytes;
155154
}
@@ -765,7 +764,7 @@ public AS4SignalMessageProcessorResult processAS4SignalMessage (@NonNull final I
765764
public void processAS4ResponseMessage (@NonNull final IAS4IncomingMessageMetadata aMessageMetadata,
766765
@NonNull final IAS4IncomingMessageState aState,
767766
@NonNull @Nonempty final String sResponseMessageID,
768-
@Nullable final byte [] aResponseBytes,
767+
final byte @Nullable [] aResponseBytes,
769768
final boolean bResponsePayloadIsAvailable)
770769
{
771770
// Now start invoking SPI handlers

phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ public PeppolUserMessageBuilder payload (@NonNull final Element aPayloadElement)
12431243
* @return this for chaining
12441244
*/
12451245
@NonNull
1246-
public PeppolUserMessageBuilder payload (@NonNull final byte [] aPayloadBytes)
1246+
public PeppolUserMessageBuilder payload (final byte @NonNull [] aPayloadBytes)
12471247
{
12481248
ValueEnforcer.notNull (aPayloadBytes, "PayloadBytes");
12491249
m_aPayloadElement = null;
@@ -1287,7 +1287,7 @@ public PeppolUserMessageBuilder payload (@NonNull final IHasInputStream aPayload
12871287
* @since 0.12.1
12881288
*/
12891289
@NonNull
1290-
public PeppolUserMessageBuilder payloadBinaryContent (@NonNull final byte [] aBinaryPayload,
1290+
public PeppolUserMessageBuilder payloadBinaryContent (final byte @NonNull [] aBinaryPayload,
12911291
@NonNull final IMimeType aMimeType,
12921292
@Nullable final Charset aCharset)
12931293
{
@@ -1584,7 +1584,7 @@ public PeppolUserMessageSBDHBuilder ()
15841584
* @see #countryC1(String)
15851585
*/
15861586
@NonNull
1587-
public PeppolUserMessageSBDHBuilder payload (@NonNull final byte [] aSBDHBytes)
1587+
public PeppolUserMessageSBDHBuilder payload (final byte @NonNull [] aSBDHBytes)
15881588
{
15891589
ValueEnforcer.notNull (aSBDHBytes, "SBDHBytes");
15901590
m_aPayloadBytes = aSBDHBytes;

0 commit comments

Comments
 (0)