Commit 060c1c48 authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

fix: use import org.apache.commons.lang3.StringUtils everywhere

parent cbbf2ef7
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/kafka/outgoing/OssClientProducer.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import static org.etsi.osl.hypo.core.common.constants.SonataKafkaTriggersConstan

import jakarta.enterprise.context.ApplicationScoped;
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.microprofile.reactive.messaging.Channel;
import org.eclipse.microprofile.reactive.messaging.Emitter;
import org.etsi.osl.hypo.api.tmf.alarm.schema.Alarm;
+3 −9
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/dto/svc/order/schema/ServiceOrderStateType.java: 3 added lines, 9 removed lines.
Original line number Diff line number Diff line
package org.etsi.osl.hypo.clients.oss.oss.external.dto.svc.order.schema;

import java.util.Arrays;
import lombok.Getter;

@Getter
public enum ServiceOrderStateType {
    ACKNOWLEDGED("acknowledged"),
    REJECTED("rejected"),
@@ -13,20 +15,12 @@ public enum ServiceOrderStateType {
    FAILED("failed"),
    PARTIAL("partial");

    private String action;
    private final String action;

    ServiceOrderStateType(String action) {
        this.action = action;
    }

    public String getAction() {
        return action;
    }

    private void setAction(String action) {
        this.action = action;
    }

    public static ServiceOrderStateType getServiceOrderStateType(String statusId) {
        return Arrays.stream(ServiceOrderStateType.values())
                .filter(
+1 −1
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/poller/ServiceInventorySupplier.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ package org.etsi.osl.hypo.clients.oss.poller;

import static org.etsi.osl.hypo.clients.oss.service.InventoryService.KUBE_CONFIG;

import io.micrometer.common.util.StringUtils;
import io.smallrye.mutiny.Uni;
import java.util.Set;
import java.util.function.Supplier;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.etsi.osl.hypo.clients.oss.model.OssLifecycleData;
import org.etsi.osl.hypo.clients.oss.oss.external.OpenSliceRestClientImpl;
import org.etsi.osl.hypo.clients.oss.oss.external.dto.svc.inventory.schema.Characteristic;
+2 −2
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/service/OrderingService.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ import static org.etsi.osl.hypo.core.common.constants.OssClientConstants.K8AAS;
import static org.etsi.osl.hypo.core.common.constants.OssClientConstants.SET;

import com.fasterxml.jackson.core.JsonProcessingException;
import io.micrometer.common.util.StringUtils;
import io.smallrye.mutiny.Uni;
import io.smallrye.mutiny.infrastructure.Infrastructure;
import jakarta.enterprise.context.ApplicationScoped;
@@ -21,6 +20,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.etsi.osl.hypo.api.tmf.alarm.schema.Alarm;
import org.etsi.osl.hypo.api.tmf.alarm.schema.model.AlarmType;
@@ -523,7 +523,7 @@ public class OrderingService {
                                        updateValueFromProvidedServiceCharacteristic(value, serviceOrderCharacteristic);
                                    } catch (JsonProcessingException e) {
                                        logger.errorf(
                                                "Characteristic with name %s does not have a value", characteristicName);
                                                e, "Characteristic with name %s does not have a value", characteristicName);
                                    }

                                    characteristic.setValue(value);
+1 −1
Changes for src/test/java/org/etsi/osl/hypo/clients/oss/service/OrderingServiceWithWireMockServerTest.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import io.micrometer.common.util.StringUtils;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.mockito.InjectSpy;
@@ -28,6 +27,7 @@ import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.etsi.osl.hypo.clients.oss.entity.ServiceOrderData;
import org.etsi.osl.hypo.clients.oss.kafka.outgoing.OssClientProducer;
import org.etsi.osl.hypo.clients.oss.oss.external.OpenSliceRestClientImpl;