From 6a4e7b114e5ac28efe47aac40b0e970bd557efbe Mon Sep 17 00:00:00 2001
From: sozyGithub <thinpotatogithub@gmail.com>
Date: Thu, 16 Nov 2023 16:41:28 +0700
Subject: [PATCH] updt: Dockerfile
---
Dockerfile | 2 +-
pom.xml | 4 +-
.../org/soapService/Handlers/LogHandler.java | 5 +--
...AccountVerificationRequestServiceImpl.java | 2 +-
.../org/soapService/Services/BaseService.java | 40 -------------------
.../Services/CatalogRequestServiceImpl.java | 8 ++--
.../Services/ReportUserServiceImpl.java | 2 +-
7 files changed, 10 insertions(+), 53 deletions(-)
delete mode 100644 src/main/java/org/soapService/Services/BaseService.java
diff --git a/Dockerfile b/Dockerfile
index 1b81d34..bb90e7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.1-amazoncorretto-8 AS build
+FROM maven:3.9-amazoncorretto-8 AS build
WORKDIR /app
COPY src /usr/src/app/src
COPY pom.xml /usr/src/app
diff --git a/pom.xml b/pom.xml
index 643a0c9..4b75106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
<version>2.0</version>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/src/main/java/org/soapService/Handlers/LogHandler.java b/src/main/java/org/soapService/Handlers/LogHandler.java
index 4f4e2d3..8e04863 100644
--- a/src/main/java/org/soapService/Handlers/LogHandler.java
+++ b/src/main/java/org/soapService/Handlers/LogHandler.java
@@ -1,7 +1,6 @@
package org.soapService.Handlers;
import com.sun.net.httpserver.HttpExchange;
-import com.sun.xml.internal.ws.developer.JAXWSProperties;
import org.soapService.Domain.Log;
import org.soapService.Repository.LogRepository;
import org.w3c.dom.NodeList;
@@ -28,14 +27,14 @@ public class LogHandler implements SOAPHandler<SOAPMessageContext> {
public boolean handleMessage(SOAPMessageContext context) {
Boolean outboundProperty = (Boolean) context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
- HttpExchange httpExchange = (HttpExchange) context.get(JAXWSProperties.HTTP_EXCHANGE);
+ HttpExchange httpExchange = (HttpExchange) context.get("com.sun.xml.internal.ws.http.exchange");
if (!outboundProperty) {
String ip = httpExchange.getRemoteAddress().getAddress().toString().replace("/", "");
String endpoint = httpExchange.getRequestURI().toString();
String operation = "";
Map<String, String> args = new HashMap<>();
-
+
try {
SOAPBody soapBody = context.getMessage().getSOAPBody();
diff --git a/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java b/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java
index 1789ff4..3d205bb 100644
--- a/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java
+++ b/src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Properties;
@WebService(endpointInterface = "org.soapService.Services.AccountVerificationRequestService")
-public class AccountVerificationRequestServiceImpl extends BaseService implements AccountVerificationRequestService {
+public class AccountVerificationRequestServiceImpl implements AccountVerificationRequestService {
private static AccountVerificationRequestRepository accountVerificationRepository = new AccountVerificationRequestRepository();
private static AccountVerificationRequestValidation accountVerificationServiceValidation = new AccountVerificationRequestValidation();
diff --git a/src/main/java/org/soapService/Services/BaseService.java b/src/main/java/org/soapService/Services/BaseService.java
deleted file mode 100644
index b65fb3e..0000000
--- a/src/main/java/org/soapService/Services/BaseService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.soapService.Services;
-
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.xml.internal.ws.developer.JAXWSProperties;
-import org.soapService.Domain.Log;
-import org.soapService.Repository.LogRepository;
-
-import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import java.sql.SQLException;
-
-public abstract class BaseService {
- @Resource
- WebServiceContext wsContext;
-
- protected void addLog() {
- MessageContext messageContext = wsContext.getMessageContext();
- HttpExchange exchange = (HttpExchange) messageContext.get(JAXWSProperties.HTTP_EXCHANGE);
-
- Log log = new Log();
- log.setIp(exchange.getRemoteAddress().getAddress().toString().replace("/", ""));
- log.setReqDesc("desc");
- log.setEndpointDest("/");
-
- LogRepository logRepository = new LogRepository();
-
-
- try {
- logRepository.add(log);
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
-
- protected void printContext() {
-// System.out.println("IP From WebService: " + (String) Handler1.threadLocal.get());
- }
-}
diff --git a/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java b/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java
index a923a04..024e464 100644
--- a/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java
+++ b/src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java
@@ -1,5 +1,6 @@
package org.soapService.Services;
+import com.google.gson.Gson;
import org.soapService.Common.HTTPStatusCode;
import org.soapService.Common.ServiceResponse;
import org.soapService.Domain.CatalogRequest;
@@ -14,12 +15,9 @@ import org.soapService.Utils.HTTPRequest;
import org.soapService.Utils.HTTPRequestMethod;
import org.soapService.Validations.CatalogValidation;
-import com.google.gson.Gson;
-
import javax.activation.DataHandler;
import javax.jws.WebService;
import javax.xml.ws.soap.SOAPFaultException;
-
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
@@ -29,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
@WebService(endpointInterface = "org.soapService.Services.CatalogRequestService")
-public class CatalogRequestServiceImpl extends BaseService implements CatalogRequestService {
+public class CatalogRequestServiceImpl implements CatalogRequestService {
private static CatalogRequestRepository catalogRepository = new CatalogRequestRepository();
private static CatalogValidation catalogValidation = new CatalogValidation();
@@ -76,7 +74,7 @@ public class CatalogRequestServiceImpl extends BaseService implements CatalogReq
}
public ServiceResponse<CatalogRequest> createCatalogRequest(String uuid, String title, String description,
- String poster, String trailer, String category)
+ String poster, String trailer, String category)
throws SOAPFaultException {
List<CatalogRequest> lcr = new ArrayList<>();
try {
diff --git a/src/main/java/org/soapService/Services/ReportUserServiceImpl.java b/src/main/java/org/soapService/Services/ReportUserServiceImpl.java
index 1bb3875..6cdbdac 100644
--- a/src/main/java/org/soapService/Services/ReportUserServiceImpl.java
+++ b/src/main/java/org/soapService/Services/ReportUserServiceImpl.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
import java.util.List;
@WebService(endpointInterface = "org.soapService.Services.ReportUserService")
-public class ReportUserServiceImpl extends BaseService implements ReportUserService {
+public class ReportUserServiceImpl implements ReportUserService {
private static ReportUserRepository reportUserRepository = new ReportUserRepository();
private static ReportUserServiceValidation reportUserServiceValidation = new ReportUserServiceValidation();
--
GitLab