Skip to content
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
4 changes: 2 additions & 2 deletions ci/spotbugs/exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@

<Match>
<Bug pattern="DLS_DEAD_LOCAL_STORE"/>
<Class name="io.github.protocol.mtconnect.examples.MtConnectClientExample"/>
<Class name="io.github.protocol.mtconnect.examples.MTConnectClientExample"/>
</Match>

<Match>
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC"/>
<Class name="io.github.protocol.mtconnect.server.MtConnectServer$MtAssetsHandler"/>
<Class name="io.github.protocol.mtconnect.server.MTConnectServer$MtAssetsHandler"/>
</Match>

</FindBugsFilter>
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import io.github.openfacade.http.HttpClient;
import io.github.openfacade.http.HttpClientFactory;

public class MtConnectClient {
private final MtConnectClientConfiguration config;
public class MTConnectClient {
private final MTConnectClientConfiguration config;

private final HttpClient httpClient;

public MtConnectClient(MtConnectClientConfiguration configuration) {
public MTConnectClient(MTConnectClientConfiguration configuration) {

Check warning on line 11 in mtconnect-client/src/main/java/io/github/protocol/mtconnect/client/MTConnectClient.java

View check run for this annotation

Codecov / codecov/patch

mtconnect-client/src/main/java/io/github/protocol/mtconnect/client/MTConnectClient.java#L11

Added line #L11 was not covered by tests
this.config = configuration;
this.httpClient = HttpClientFactory.createHttpClient(configuration.httpConfig());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import lombok.Setter;

@Setter
public class MtConnectClientConfiguration {
public class MTConnectClientConfiguration {
private String host;

private int port;

private HttpClientConfig httpConfig;

public MtConnectClientConfiguration() {
public MTConnectClientConfiguration() {

Check warning on line 14 in mtconnect-client/src/main/java/io/github/protocol/mtconnect/client/MTConnectClientConfiguration.java

View check run for this annotation

Codecov / codecov/patch

mtconnect-client/src/main/java/io/github/protocol/mtconnect/client/MTConnectClientConfiguration.java#L14

Added line #L14 was not covered by tests
}

public String host() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.github.protocol.mtconnect.examples;

import io.github.openfacade.http.HttpClientConfig;
import io.github.protocol.mtconnect.client.MtConnectClient;
import io.github.protocol.mtconnect.client.MtConnectClientConfiguration;
import io.github.protocol.mtconnect.client.MTConnectClient;
import io.github.protocol.mtconnect.client.MTConnectClientConfiguration;

public class MtConnectClientExample {
public class MTConnectClientExample {
public static void main(String[] args) {
MtConnectClientConfiguration configuration = new MtConnectClientConfiguration();
MTConnectClientConfiguration configuration = new MTConnectClientConfiguration();
HttpClientConfig httpClientConfig = new HttpClientConfig.Builder().build();
configuration.setHttpConfig(httpClientConfig);
MtConnectClient mtConnectClient = new MtConnectClient(configuration);
MTConnectClient mtConnectClient = new MTConnectClient(configuration);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

import io.github.openfacade.http.HttpServerConfig;
import io.github.openfacade.http.HttpServerEngine;
import io.github.protocol.mtconnect.server.MtConnectServer;
import io.github.protocol.mtconnect.server.MtConnectServerConfiguration;
import io.github.protocol.mtconnect.server.MTConnectServer;
import io.github.protocol.mtconnect.server.MTConnectServerConfiguration;
import io.github.protocol.mtconnect.server.impl.IoTDAMtProcessor;

public class MtConnectIoTDAServerExample {
public class MTConnectIoTDAServerExample {
public static void main(String[] args) {
MtConnectServerConfiguration configuration = new MtConnectServerConfiguration();
MTConnectServerConfiguration configuration = new MTConnectServerConfiguration();
HttpServerConfig httpServerConfig = new HttpServerConfig.Builder()
.engine(HttpServerEngine.Vertx)
.host("127.0.0.1")
.port(36633)
.build();
configuration.setHttpConfig(httpServerConfig);
configuration.setMtProcessor(new IoTDAMtProcessor("your_ak", "your_sk"));
MtConnectServer mtConnectServer = new MtConnectServer(configuration);
MTConnectServer mtConnectServer = new MTConnectServer(configuration);
mtConnectServer.start().join();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

import io.github.openfacade.http.HttpServerConfig;
import io.github.openfacade.http.HttpServerEngine;
import io.github.protocol.mtconnect.server.MtConnectServer;
import io.github.protocol.mtconnect.server.MtConnectServerConfiguration;
import io.github.protocol.mtconnect.server.MTConnectServer;
import io.github.protocol.mtconnect.server.MTConnectServerConfiguration;
import io.github.protocol.mtconnect.server.impl.MemoryMtProcessor;

public class MtConnectMemoryServerExample {
public class MTConnectMemoryServerExample {
public static void main(String[] args) {
MtConnectServerConfiguration configuration = new MtConnectServerConfiguration();
MTConnectServerConfiguration configuration = new MTConnectServerConfiguration();
HttpServerConfig httpServerConfig = new HttpServerConfig.Builder()
.engine(HttpServerEngine.Vertx)
.host("127.0.0.1")
.port(36633)
.build();
configuration.setHttpConfig(httpServerConfig);
configuration.setMtProcessor(new MemoryMtProcessor());
MtConnectServer mtConnectServer = new MtConnectServer(configuration);
MTConnectServer mtConnectServer = new MTConnectServer(configuration);
mtConnectServer.start().join();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
import java.nio.charset.StandardCharsets;
import java.util.concurrent.CompletableFuture;

public class MtConnectServer {
private final MtConnectServerConfiguration config;
public class MTConnectServer {
private final MTConnectServerConfiguration config;

private final HttpServer httpServer;

private final MtProcessor mtProcessor;
private final MTProcessor mtProcessor;

public MtConnectServer(MtConnectServerConfiguration configuration) {
public MTConnectServer(MTConnectServerConfiguration configuration) {

Check warning on line 24 in mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MTConnectServer.java

View check run for this annotation

Codecov / codecov/patch

mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MTConnectServer.java#L24

Added line #L24 was not covered by tests
this.config = configuration;
this.httpServer = HttpServerFactory.createHttpServer(config.httpConfig());
this.mtProcessor = configuration.mtHandler();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
import lombok.Setter;

@Setter
public class MtConnectServerConfiguration {
public class MTConnectServerConfiguration {
private HttpServerConfig httpConfig;

private MtProcessor mtProcessor;
private MTProcessor mtProcessor;

public MtConnectServerConfiguration() {
public MTConnectServerConfiguration() {

Check warning on line 12 in mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MTConnectServerConfiguration.java

View check run for this annotation

Codecov / codecov/patch

mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MTConnectServerConfiguration.java#L12

Added line #L12 was not covered by tests
}

public HttpServerConfig httpConfig() {
return httpConfig;
}

public MtProcessor mtHandler() {
public MTProcessor mtHandler() {
return mtProcessor;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import io.github.protocol.mtconnect.api.MTConnectAssets;
import io.github.protocol.mtconnect.api.MTConnectDevices;

public interface MtProcessor {
public interface MTProcessor {
MTConnectAssets asset(AssetRequest assetRequest);
MTConnectDevices device(DeviceRequest deviceRequest);
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import io.github.protocol.mtconnect.api.DeviceRequest;
import io.github.protocol.mtconnect.api.MTConnectAssets;
import io.github.protocol.mtconnect.api.MTConnectDevices;
import io.github.protocol.mtconnect.server.MtProcessor;
import io.github.protocol.mtconnect.server.MTProcessor;

public class IoTDAMtProcessor implements MtProcessor {
public class IoTDAMtProcessor implements MTProcessor {
private final String ak;

private final String sk;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
import io.github.protocol.mtconnect.api.DeviceRequest;
import io.github.protocol.mtconnect.api.MTConnectAssets;
import io.github.protocol.mtconnect.api.MTConnectDevices;
import io.github.protocol.mtconnect.server.MtProcessor;
import io.github.protocol.mtconnect.server.MTProcessor;

import java.util.HashMap;
import java.util.Map;

/**
* MemoryMtProcessor is a simple implementation of MtProcessor that stores all the data in memory.
*/
public class MemoryMtProcessor implements MtProcessor {
public class MemoryMtProcessor implements MTProcessor {

Check warning on line 15 in mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/MemoryMtProcessor.java

View check run for this annotation

Codecov / codecov/patch

mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/MemoryMtProcessor.java#L15

Added line #L15 was not covered by tests

Map<String, MTConnectAssets> mtConnectAssetsMap = new HashMap<>();

Expand Down

This file was deleted.