Skip to content
This repository has been archived by the owner on Feb 7, 2024. It is now read-only.

bump oap to 21.2.1 #164

Merged
merged 2 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oap-ws-account-api/src/main/java/oap/ws/account/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public String getAccessKey() {
}

public void refreshApiKey() {
this.apiKey = org.apache.commons.lang.RandomStringUtils.random( 30, true, true );
this.apiKey = org.apache.commons.lang3.RandomStringUtils.random( 30, true, true );
}

public String getSecretKey() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

package oap.ws.openapi;

import aQute.lib.base64.Base64;
import com.fasterxml.jackson.annotation.JsonIgnore;
import oap.http.server.nio.HttpServerExchange;
import oap.json.ext.Ext;
Expand All @@ -16,6 +15,7 @@

import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -97,12 +97,13 @@ public void code( int code, HttpServerExchange exchange ) {
public String bytesParam( @WsParam( from = BODY ) byte[] bytes ) {
return new String( bytes );
}

public byte[] bytesResult( @WsParam( from = BODY ) String toBytes ) {
return Base64.decodeBase64( toBytes );
return Base64.getDecoder().decode( toBytes );
}

public List<byte[]> listOfBytesResult( @WsParam( from = BODY ) String toBytes ) {
return Lists.of( Base64.decodeBase64( toBytes ), new byte[] { 0x1, 0x2, 0x3 } );
return Lists.of( Base64.getDecoder().decode( toBytes ), new byte[] { 0x1, 0x2, 0x3 } );
}

public String stringParam( @WsParam( from = BODY ) String bytes ) {
Expand All @@ -112,9 +113,11 @@ public String stringParam( @WsParam( from = BODY ) String bytes ) {
public oap.util.Stream<String> getOapStreamOfStrings() {
return Stream.of();
}

public java.util.stream.Stream<String> getVanillaStreamOfStrings( @WsParam( from = BODY ) List<String> str ) {
return new ArrayList<>( str ).stream();
}

public CreativeUniversal getCreativeUniversal() {
return new CreativeUniversal();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import oap.ws.WsParam;
import oap.ws.api.Info.WebMethodInfo;
import oap.ws.openapi.swagger.DeprecationAnnotationResolver;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.ContentType;

import java.lang.reflect.GenericArrayType;
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
</distributionManagement>

<properties>
<oap-ws.project.version>21.2.1</oap-ws.project.version>
<oap-ws.project.version>21.2.2</oap-ws.project.version>

<oap.deps.oap.version>21.2.0</oap.deps.oap.version>
<oap.deps.oap.version>21.2.1</oap.deps.oap.version>

<oap.deps.mail.version>21.1.1</oap.deps.mail.version>
<oap.deps.storage.version>21.1.0</oap.deps.storage.version>
<oap.deps.mail.version>21.1.2</oap.deps.mail.version>
<oap.deps.storage.version>21.1.1</oap.deps.storage.version>

<oap.deps.guava.version>33.0.0-jre</oap.deps.guava.version>
<oap.deps.slf4j.version>2.0.9</oap.deps.slf4j.version>
Expand Down