From a538db4eb944003cdd0233ca1f8f8fb5bcc86ef3 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 25 May 2023 09:49:27 +0300 Subject: [PATCH 1/7] 3_5_HW2_xslt --- .../masterjava/xml/util/XsltProcessor.java | 4 ++ src/main/resources/groups.xsl | 37 +++++++++++++++++++ .../java/ru/javaops/masterjava/MainXml.java | 16 ++++++++ 3 files changed, 57 insertions(+) create mode 100644 src/main/resources/groups.xsl diff --git a/src/main/java/ru/javaops/masterjava/xml/util/XsltProcessor.java b/src/main/java/ru/javaops/masterjava/xml/util/XsltProcessor.java index 019eeed..083febb 100644 --- a/src/main/java/ru/javaops/masterjava/xml/util/XsltProcessor.java +++ b/src/main/java/ru/javaops/masterjava/xml/util/XsltProcessor.java @@ -40,4 +40,8 @@ public void transform(Reader sourceReader, Writer result) throws TransformerExce public static String getXsltHeader(String xslt) { return "\n"; } + + public void setParameter(String name, String value) { + xformer.setParameter(name, value); + } } diff --git a/src/main/resources/groups.xsl b/src/main/resources/groups.xsl new file mode 100644 index 0000000..c5ade36 --- /dev/null +++ b/src/main/resources/groups.xsl @@ -0,0 +1,37 @@ + + + + + + + + + + <xsl:value-of select="$projectName"/> groups + + + +

+ groups +

+ + + + + + + + + + + +

Group	Type
+ +	+ +

+ + + + \ No newline at end of file diff --git a/src/test/java/ru/javaops/masterjava/MainXml.java b/src/test/java/ru/javaops/masterjava/MainXml.java index bcd5894..8f57825 100644 --- a/src/test/java/ru/javaops/masterjava/MainXml.java +++ b/src/test/java/ru/javaops/masterjava/MainXml.java @@ -11,6 +11,7 @@ import ru.javaops.masterjava.xml.util.JaxbParser; import ru.javaops.masterjava.xml.util.Schemas; import ru.javaops.masterjava.xml.util.StaxStreamProcessor; +import ru.javaops.masterjava.xml.util.XsltProcessor; import javax.xml.stream.events.XMLEvent; import java.io.InputStream; @@ -49,6 +50,12 @@ public static void main(String[] args) throws Exception { System.out.println(); users = processByStax(projectName, payloadUrl); users.forEach(System.out::println); + + System.out.println(); + html = transform(projectName, payloadUrl); + try (Writer writer = Files.newBufferedWriter(Paths.get("out/groups.html"))) { + writer.write(html); + } } private static Set parseByJaxb(String projectName, URL payloadUrl) throws Exception { @@ -121,4 +128,13 @@ private static String toHtml(Set users, String projectName) { body().with(h1(projectName + " users"), table) ).render(); } + + private static String transform(String projectName, URL payloadUrl) throws Exception { + URL xsl = Resources.getResource("groups.xsl"); + try (InputStream xmlStream = payloadUrl.openStream(); InputStream xslStream = xsl.openStream()) { + XsltProcessor processor = new XsltProcessor(xslStream); + processor.setParameter("projectName", projectName); + return processor.transform(xmlStream); + } + } } From cdb54e1f6280104c577883d9f70b2c288c5994f6 Mon Sep 17 00:00:00 2001 From: user Date: Wed, 7 Jun 2023 16:51:00 +0300 Subject: [PATCH 2/7] 3_6_multimodule.patch --- common/pom.xml | 21 +++++++++ parent/pom.xml | 69 ++++++++++++++++++++++++++++ pom.xml | 120 +++++-------------------------------------------- upload/pom.xml | 39 ++++++++++++++++ 4 files changed, 140 insertions(+), 109 deletions(-) create mode 100644 common/pom.xml create mode 100644 parent/pom.xml create mode 100644 upload/pom.xml diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000..33d3da8 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + ru.javaops + parent + ../parent/pom.xml + 1.0-SNAPSHOT + + + common + 1.0-SNAPSHOT + jar + Common + + + + \ No newline at end of file diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 0000000..d7b056d --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + ru.javaops + parent + pom + 1.0-SNAPSHOT + Parent + + + 1.8 + UTF-8 + UTF-8 + + + + install + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + -Dfile.encoding=UTF-8 + + + + + + + + com.google.guava + guava + 23.3-jre + + + one.util + streamex + RELEASE + + + + + junit + junit + 4.12 + test + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8809434..0085819 100644 --- a/pom.xml +++ b/pom.xml @@ -4,119 +4,21 @@ ru.javaops masterjava - jar + pom 1.0-SNAPSHOT Master Java https://github.com/JavaOPs/masterjava - - 1.8 - UTF-8 - UTF-8 - - - - masterjava - install - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - -Dfile.encoding=UTF-8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.0 - - - package - - shade - - - benchmarks - - - org.openjdk.jmh.Main - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - - org.openjdk.jmh - jmh-core - RELEASE - - - org.openjdk.jmh - jmh-generator-annprocess - RELEASE - provided - - - com.google.guava - guava - 21.0 - - - one.util - streamex - RELEASE - - - - com.j2html - j2html - RELEASE - - - - - junit - junit - 4.12 - test - - - - - - - - + + upload + common + + diff --git a/upload/pom.xml b/upload/pom.xml new file mode 100644 index 0000000..7cac01c --- /dev/null +++ b/upload/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + + ru.javaops + parent + ../parent/pom.xml + 1.0-SNAPSHOT + + + upload + 1.0-SNAPSHOT + war + Upload + + + + + org.apache.maven.plugins + maven-war-plugin + 3.2.0 + + false + + + + + + + + ru.javaops + common + ${project.version} + + + \ No newline at end of file From 797f01ba17cf9895e4e62970e3b7a84702bc7555 Mon Sep 17 00:00:00 2001 From: user Date: Wed, 7 Jun 2023 19:28:28 +0300 Subject: [PATCH 3/7] HW3 with no Optional --- mail-service/pom.xml | 31 ++ parent-web/pom.xml | 45 +++ pom.xml | 2 - .../javaops/masterjava/matrix/MainMatrix.java | 48 --- .../masterjava/matrix/MatrixBenchmark.java | 85 ----- .../javaops/masterjava/matrix/MatrixUtil.java | 157 --------- .../masterjava/service/MailService.java | 141 -------- .../masterjava/xml/schema/CityType.java | 94 ----- .../masterjava/xml/schema/FlagType.java | 54 --- .../masterjava/xml/schema/GroupType.java | 40 --- .../masterjava/xml/schema/ObjectFactory.java | 109 ------ .../masterjava/xml/schema/Payload.java | 328 ------------------ .../masterjava/xml/schema/Project.java | 216 ------------ .../javaops/masterjava/xml/schema/User.java | 180 ---------- .../masterjava/xml/util/JaxbMarshaller.java | 39 --- .../masterjava/xml/util/JaxbParser.java | 93 ----- .../masterjava/xml/util/JaxbUnmarshaller.java | 38 -- .../javaops/masterjava/xml/util/Schemas.java | 48 --- .../xml/util/StaxStreamProcessor.java | 79 ----- .../masterjava/xml/util/XPathProcessor.java | 58 ---- .../masterjava/xml/util/XsltProcessor.java | 47 --- src/main/resources/cities.xsl | 9 - src/main/resources/groups.xsl | 37 -- src/main/resources/payload.xsd | 97 ------ .../java/ru/javaops/masterjava/MainXml.java | 140 -------- .../masterjava/xml/util/JaxbParserTest.java | 40 --- .../xml/util/StaxStreamProcessorTest.java | 36 -- .../xml/util/XPathProcessorTest.java | 26 -- .../xml/util/XsltProcessorTest.java | 18 - src/test/resources/city.xml | 4 - src/test/resources/payload.xml | 31 -- test/pom.xml | 77 ++++ upload/pom.xml | 21 +- 33 files changed, 162 insertions(+), 2306 deletions(-) create mode 100644 mail-service/pom.xml create mode 100644 parent-web/pom.xml delete mode 100644 src/main/java/ru/javaops/masterjava/matrix/MainMatrix.java delete mode 100644 src/main/java/ru/javaops/masterjava/matrix/MatrixBenchmark.java delete mode 100644 src/main/java/ru/javaops/masterjava/matrix/MatrixUtil.java delete mode 100644 src/main/java/ru/javaops/masterjava/service/MailService.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/schema/CityType.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/schema/FlagType.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/schema/GroupType.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/schema/ObjectFactory.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/schema/Payload.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/schema/Project.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/schema/User.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/util/JaxbMarshaller.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/util/JaxbParser.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/util/JaxbUnmarshaller.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/util/Schemas.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/util/StaxStreamProcessor.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/util/XPathProcessor.java delete mode 100644 src/main/java/ru/javaops/masterjava/xml/util/XsltProcessor.java delete mode 100644 src/main/resources/cities.xsl delete mode 100644 src/main/resources/groups.xsl delete mode 100644 src/main/resources/payload.xsd delete mode 100644 src/test/java/ru/javaops/masterjava/MainXml.java delete mode 100644 src/test/java/ru/javaops/masterjava/xml/util/JaxbParserTest.java delete mode 100644 src/test/java/ru/javaops/masterjava/xml/util/StaxStreamProcessorTest.java delete mode 100644 src/test/java/ru/javaops/masterjava/xml/util/XPathProcessorTest.java delete mode 100644 src/test/java/ru/javaops/masterjava/xml/util/XsltProcessorTest.java delete mode 100644 src/test/resources/city.xml delete mode 100644 src/test/resources/payload.xml create mode 100644 test/pom.xml diff --git a/mail-service/pom.xml b/mail-service/pom.xml new file mode 100644 index 0000000..8870a21 --- /dev/null +++ b/mail-service/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + + ru.javaops + parent-web + ../parent-web/pom.xml + 1.0-SNAPSHOT + + + mail-service + 1.0-SNAPSHOT + Mail-service + war + + + mail-service + + + + + ru.javaops + mail-api + 1.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/parent-web/pom.xml b/parent-web/pom.xml new file mode 100644 index 0000000..3282378 --- /dev/null +++ b/parent-web/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + + ru.javaops + parent + ../parent/pom.xml + 1.0-SNAPSHOT + + + parent-web + pom + 1.0-SNAPSHOT + Parent Web + + + + + org.apache.maven.plugins + maven-war-plugin + 3.2.0 + + false + + + + + + + + ${project.groupId} + common + ${project.version} + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0085819..5b1a0e6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,11 +14,9 @@ upload common - diff --git a/src/main/java/ru/javaops/masterjava/matrix/MainMatrix.java b/src/main/java/ru/javaops/masterjava/matrix/MainMatrix.java deleted file mode 100644 index 1f13806..0000000 --- a/src/main/java/ru/javaops/masterjava/matrix/MainMatrix.java +++ /dev/null @@ -1,48 +0,0 @@ -package ru.javaops.masterjava.matrix; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -public class MainMatrix { - private static final int MATRIX_SIZE = 1000; - private static final int THREAD_NUMBER = 10; - - private final static ExecutorService executor = Executors.newFixedThreadPool(MainMatrix.THREAD_NUMBER); - - public static void main(String[] args) throws ExecutionException, InterruptedException { - final int[][] matrixA = MatrixUtil.create(MATRIX_SIZE); - final int[][] matrixB = MatrixUtil.create(MATRIX_SIZE); - - double singleThreadSum = 0.; - double concurrentThreadSum = 0.; - int count = 1; - while (count < 6) { - System.out.println("Pass " + count); - long start = System.currentTimeMillis(); - final int[][] matrixC = MatrixUtil.singleThreadMultiplyOpt(matrixA, matrixB); - double duration = (System.currentTimeMillis() - start) / 1000.; - out("Single thread time, sec: %.3f", duration); - singleThreadSum += duration; - - start = System.currentTimeMillis(); - final int[][] concurrentMatrixC = MatrixUtil.concurrentMultiplyStreams(matrixA, matrixB, Runtime.getRuntime().availableProcessors() - 1); - duration = (System.currentTimeMillis() - start) / 1000.; - out("Concurrent thread time, sec: %.3f", duration); - concurrentThreadSum += duration; - - if (!MatrixUtil.compare(matrixC, concurrentMatrixC)) { - System.err.println("Comparison failed"); - break; - } - count++; - } - executor.shutdown(); - out("\nAverage single thread time, sec: %.3f", singleThreadSum / 5.); - out("Average concurrent thread time, sec: %.3f", concurrentThreadSum / 5.); - } - - private static void out(String format, double ms) { - System.out.println(String.format(format, ms)); - } -} diff --git a/src/main/java/ru/javaops/masterjava/matrix/MatrixBenchmark.java b/src/main/java/ru/javaops/masterjava/matrix/MatrixBenchmark.java deleted file mode 100644 index 2df2fc6..0000000 --- a/src/main/java/ru/javaops/masterjava/matrix/MatrixBenchmark.java +++ /dev/null @@ -1,85 +0,0 @@ -package ru.javaops.masterjava.matrix; - -import org.openjdk.jmh.annotations.*; -import org.openjdk.jmh.runner.Runner; -import org.openjdk.jmh.runner.RunnerException; -import org.openjdk.jmh.runner.options.Options; -import org.openjdk.jmh.runner.options.OptionsBuilder; -import org.openjdk.jmh.runner.options.TimeValue; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -@Warmup(iterations = 10) -@Measurement(iterations = 10) -@BenchmarkMode({Mode.SingleShotTime}) -@OutputTimeUnit(TimeUnit.MILLISECONDS) -@State(Scope.Benchmark) -@Threads(1) -@Fork(10) -@Timeout(time = 5, timeUnit = TimeUnit.MINUTES) -public class MatrixBenchmark { - - // Matrix size - private static final int MATRIX_SIZE = 1000; - - @Param({"3", "4", "10"}) - private int threadNumber; - - private static int[][] matrixA; - private static int[][] matrixB; - - @Setup - public void setUp() { - matrixA = MatrixUtil.create(MATRIX_SIZE); - matrixB = MatrixUtil.create(MATRIX_SIZE); - } - - private ExecutorService executor; - - public static void main(String[] args) throws RunnerException { - Options options = new OptionsBuilder() - .include(MatrixBenchmark.class.getSimpleName()) - .threads(1) - .forks(10) - .timeout(TimeValue.minutes(5)) - .build(); - new Runner(options).run(); - } - - // @Benchmark - public int[][] singleThreadMultiplyOpt() throws Exception { - return MatrixUtil.singleThreadMultiplyOpt(matrixA, matrixB); - } - - // @Benchmark - public int[][] singleThreadMultiplyOpt2() throws Exception { - return MatrixUtil.singleThreadMultiplyOpt(matrixA, matrixB); - } - - @Benchmark - public int[][] concurrentMultiplyStreams() throws Exception { - return MatrixUtil.concurrentMultiplyStreams(matrixA, matrixB, threadNumber); - } - - // @Benchmark - public int[][] concurrentMultiply() throws Exception { - return MatrixUtil.concurrentMultiply(matrixA, matrixB, executor); - } - - @Benchmark - public int[][] concurrentMultiply2() throws Exception { - return MatrixUtil.concurrentMultiply2(matrixA, matrixB, executor); - } - - @Setup - public void setup() { - executor = Executors.newFixedThreadPool(threadNumber); - } - - @TearDown - public void tearDown() { - executor.shutdown(); - } -} \ No newline at end of file diff --git a/src/main/java/ru/javaops/masterjava/matrix/MatrixUtil.java b/src/main/java/ru/javaops/masterjava/matrix/MatrixUtil.java deleted file mode 100644 index d00a67a..0000000 --- a/src/main/java/ru/javaops/masterjava/matrix/MatrixUtil.java +++ /dev/null @@ -1,157 +0,0 @@ -package ru.javaops.masterjava.matrix; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.*; -import java.util.stream.IntStream; - -public class MatrixUtil { - - public static int[][] concurrentMultiplyStreams(int[][] matrixA, int[][] matrixB, int threadNumber) - throws InterruptedException, ExecutionException { - - final int matrixSize = matrixA.length; - final int[][] matrixC = new int[matrixSize][matrixSize]; - - new ForkJoinPool(threadNumber).submit( - () -> IntStream.range(0, matrixSize) - .parallel() - .forEach(row -> { - final int[] rowA = matrixA[row]; - final int[] rowC = matrixC[row]; - - for (int idx = 0; idx < matrixSize; idx++) { - final int elA = rowA[idx]; - final int[] rowB = matrixB[idx]; - for (int col = 0; col < matrixSize; col++) { - rowC[col] += elA * rowB[col]; - } - } - })).get(); - - return matrixC; - } - - public static int[][] concurrentMultiply(int[][] matrixA, int[][] matrixB, ExecutorService executor) throws InterruptedException, ExecutionException { - final int matrixSize = matrixA.length; - final int[][] matrixC = new int[matrixSize][]; - - final int[][] matrixBT = new int[matrixSize][matrixSize]; - for (int i = 0; i < matrixSize; i++) { - for (int j = 0; j < matrixSize; j++) { - matrixBT[i][j] = matrixB[j][i]; - } - } - - List> tasks = new ArrayList<>(matrixSize); - for (int j = 0; j < matrixSize; j++) { - final int row = j; - tasks.add(() -> { - final int[] rowC = new int[matrixSize]; - for (int col = 0; col < matrixSize; col++) { - final int[] rowA = matrixA[row]; - final int[] columnB = matrixBT[col]; - int sum = 0; - for (int k = 0; k < matrixSize; k++) { - sum += rowA[k] * columnB[k]; - } - rowC[col] = sum; - } - matrixC[row] = rowC; - return null; - }); - } - executor.invokeAll(tasks); - return matrixC; - } - - public static int[][] concurrentMultiply2(int[][] matrixA, int[][] matrixB, ExecutorService executor) throws InterruptedException { - final int matrixSize = matrixA.length; - final int[][] matrixC = new int[matrixSize][matrixSize]; - final CountDownLatch latch = new CountDownLatch(matrixSize); - - for (int row = 0; row < matrixSize; row++) { - final int[] rowA = matrixA[row]; - final int[] rowC = matrixC[row]; - - executor.submit(() -> { - for (int idx = 0; idx < matrixSize; idx++) { - final int elA = rowA[idx]; - final int[] rowB = matrixB[idx]; - for (int col = 0; col < matrixSize; col++) { - rowC[col] += elA * rowB[col]; - } - } - latch.countDown(); - }); - } - latch.await(); - return matrixC; - } - - public static int[][] singleThreadMultiplyOpt(int[][] matrixA, int[][] matrixB) { - final int matrixSize = matrixA.length; - final int[][] matrixC = new int[matrixSize][matrixSize]; - - for (int col = 0; col < matrixSize; col++) { - final int[] columnB = new int[matrixSize]; - for (int k = 0; k < matrixSize; k++) { - columnB[k] = matrixB[k][col]; - } - - for (int row = 0; row < matrixSize; row++) { - int sum = 0; - final int[] rowA = matrixA[row]; - for (int k = 0; k < matrixSize; k++) { - sum += rowA[k] * columnB[k]; - } - matrixC[row][col] = sum; - } - } - return matrixC; - } - - public static int[][] singleThreadMultiplyOpt2(int[][] matrixA, int[][] matrixB) { - final int matrixSize = matrixA.length; - final int[][] matrixC = new int[matrixSize][matrixSize]; - - for (int row = 0; row < matrixSize; row++) { - final int[] rowA = matrixA[row]; - final int[] rowC = matrixC[row]; - - for (int idx = 0; idx < matrixSize; idx++) { - final int elA = rowA[idx]; - final int[] rowB = matrixB[idx]; - for (int col = 0; col < matrixSize; col++) { - rowC[col] += elA * rowB[col]; - } - } - } - return matrixC; - } - - public static int[][] create(int size) { - int[][] matrix = new int[size][size]; - Random rn = new Random(); - - for (int i = 0; i < size; i++) { - for (int j = 0; j < size; j++) { - matrix[i][j] = rn.nextInt(10); - } - } - return matrix; - } - - public static boolean compare(int[][] matrixA, int[][] matrixB) { - final int matrixSize = matrixA.length; - for (int i = 0; i < matrixSize; i++) { - for (int j = 0; j < matrixSize; j++) { - if (matrixA[i][j] != matrixB[i][j]) { - return false; - } - } - } - return true; - } -} \ No newline at end of file diff --git a/src/main/java/ru/javaops/masterjava/service/MailService.java b/src/main/java/ru/javaops/masterjava/service/MailService.java deleted file mode 100644 index cef46e5..0000000 --- a/src/main/java/ru/javaops/masterjava/service/MailService.java +++ /dev/null @@ -1,141 +0,0 @@ -package ru.javaops.masterjava.service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.concurrent.*; -import java.util.stream.Collectors; - -public class MailService { - private static final String OK = "OK"; - - private static final String INTERRUPTED_BY_FAULTS_NUMBER = "+++ Interrupted by faults number"; - private static final String INTERRUPTED_BY_TIMEOUT = "+++ Interrupted by timeout"; - private static final String INTERRUPTED_EXCEPTION = "+++ InterruptedException"; - - private final ExecutorService mailExecutor = Executors.newFixedThreadPool(8); - - public GroupResult sendToList(final String template, final Set emails) throws Exception { - final CompletionService completionService = new ExecutorCompletionService<>(mailExecutor); - - List> futures = emails.stream() - .map(email -> completionService.submit(() -> sendToUser(template, email))) - .collect(Collectors.toList()); - - return new Callable() { - private int success = 0; - private List failed = new ArrayList<>(); - - @Override - public GroupResult call() { - while (!futures.isEmpty()) { - try { - Future future = completionService.poll(10, TimeUnit.SECONDS); - if (future == null) { - return cancelWithFail(INTERRUPTED_BY_TIMEOUT); - } - futures.remove(future); - MailResult mailResult = future.get(); - if (mailResult.isOk()) { - success++; - } else { - failed.add(mailResult); - if (failed.size() >= 5) { - return cancelWithFail(INTERRUPTED_BY_FAULTS_NUMBER); - } - } - } catch (ExecutionException e) { - return cancelWithFail(e.getCause().toString()); - } catch (InterruptedException e) { - return cancelWithFail(INTERRUPTED_EXCEPTION); - } - } -/* - for (Future future : futures) { - MailResult mailResult; - try { - mailResult = future.get(10, TimeUnit.SECONDS); - } catch (InterruptedException e) { - return cancelWithFail(INTERRUPTED_EXCEPTION); - } catch (ExecutionException e) { - return cancelWithFail(e.getCause().toString()); - } catch (TimeoutException e) { - return cancelWithFail(INTERRUPTED_BY_TIMEOUT); - } - if (mailResult.isOk()) { - success++; - } else { - failed.add(mailResult); - if (failed.size() >= 5) { - return cancelWithFail(INTERRUPTED_BY_FAULTS_NUMBER); - } - } - } -*/ - return new GroupResult(success, failed, null); - } - - private GroupResult cancelWithFail(String cause) { - futures.forEach(f -> f.cancel(true)); - return new GroupResult(success, failed, cause); - } - }.call(); - } - - // dummy realization - public MailResult sendToUser(String template, String email) throws Exception { - try { - Thread.sleep(500); //delay - } catch (InterruptedException e) { - // log cancel; - return null; - } - return Math.random() < 0.7 ? MailResult.ok(email) : MailResult.error(email, "Error"); - } - - public static class MailResult { - private final String email; - private final String result; - - private static MailResult ok(String email) { - return new MailResult(email, OK); - } - - private static MailResult error(String email, String error) { - return new MailResult(email, error); - } - - public boolean isOk() { - return OK.equals(result); - } - - private MailResult(String email, String cause) { - this.email = email; - this.result = cause; - } - - @Override - public String toString() { - return '(' + email + ',' + result + ')'; - } - } - - public static class GroupResult { - private final int success; // number of successfully sent email - private final List failed; // failed emails with causes - private final String failedCause; // global fail cause - - public GroupResult(int success, List failed, String failedCause) { - this.success = success; - this.failed = failed; - this.failedCause = failedCause; - } - - @Override - public String toString() { - return "Success: " + success + '\n' + - "Failed: " + failed.toString() + '\n' + - (failedCause == null ? "" : "Failed cause" + failedCause); - } - } -} \ No newline at end of file diff --git a/src/main/java/ru/javaops/masterjava/xml/schema/CityType.java b/src/main/java/ru/javaops/masterjava/xml/schema/CityType.java deleted file mode 100644 index 029e352..0000000 --- a/src/main/java/ru/javaops/masterjava/xml/schema/CityType.java +++ /dev/null @@ -1,94 +0,0 @@ - -package ru.javaops.masterjava.xml.schema; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - *

Java class for cityType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cityType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
- *

- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cityType", namespace = "http://javaops.ru", propOrder = { - "value" -}) -public class CityType { - - @XmlValue - protected String value; - @XmlAttribute(name = "id", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/src/main/java/ru/javaops/masterjava/xml/schema/FlagType.java b/src/main/java/ru/javaops/masterjava/xml/schema/FlagType.java deleted file mode 100644 index eda39fa..0000000 --- a/src/main/java/ru/javaops/masterjava/xml/schema/FlagType.java +++ /dev/null @@ -1,54 +0,0 @@ - -package ru.javaops.masterjava.xml.schema; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for flagType. - * - *

The following schema fragment specifies the expected content contained within this class. - *

- *

- * <simpleType name="flagType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="active"/>
- *     <enumeration value="deleted"/>
- *     <enumeration value="superuser"/>
- *   </restriction>
- * </simpleType>
- *

- * - */ -@XmlType(name = "flagType", namespace = "http://javaops.ru") -@XmlEnum -public enum FlagType { - - @XmlEnumValue("active") - ACTIVE("active"), - @XmlEnumValue("deleted") - DELETED("deleted"), - @XmlEnumValue("superuser") - SUPERUSER("superuser"); - private final String value; - - FlagType(String v) { - value = v; - } - - public String value() { - return value; - } - - public static FlagType fromValue(String v) { - for (FlagType c: FlagType.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v); - } - -} diff --git a/src/main/java/ru/javaops/masterjava/xml/schema/GroupType.java b/src/main/java/ru/javaops/masterjava/xml/schema/GroupType.java deleted file mode 100644 index d504164..0000000 --- a/src/main/java/ru/javaops/masterjava/xml/schema/GroupType.java +++ /dev/null @@ -1,40 +0,0 @@ - -package ru.javaops.masterjava.xml.schema; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for groupType. - * - *

The following schema fragment specifies the expected content contained within this class. - *

- *

- * <simpleType name="groupType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="REGISTERING"/>
- *     <enumeration value="CURRENT"/>
- *     <enumeration value="FINISHED"/>
- *   </restriction>
- * </simpleType>
- *

- * - */ -@XmlType(name = "groupType", namespace = "http://javaops.ru") -@XmlEnum -public enum GroupType { - - REGISTERING, - CURRENT, - FINISHED; - - public String value() { - return name(); - } - - public static GroupType fromValue(String v) { - return valueOf(v); - } - -} diff --git a/src/main/java/ru/javaops/masterjava/xml/schema/ObjectFactory.java b/src/main/java/ru/javaops/masterjava/xml/schema/ObjectFactory.java deleted file mode 100644 index bfb3932..0000000 --- a/src/main/java/ru/javaops/masterjava/xml/schema/ObjectFactory.java +++ /dev/null @@ -1,109 +0,0 @@ - -package ru.javaops.masterjava.xml.schema; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the ru.javaops.masterjava.xml.schema package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _City_QNAME = new QName("http://javaops.ru", "City"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: ru.javaops.masterjava.xml.schema - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Project } - * - */ - public Project createProject() { - return new Project(); - } - - /** - * Create an instance of {@link Payload } - * - */ - public Payload createPayload() { - return new Payload(); - } - - /** - * Create an instance of {@link Project.Group } - * - */ - public Project.Group createProjectGroup() { - return new Project.Group(); - } - - /** - * Create an instance of {@link User } - * - */ - public User createUser() { - return new User(); - } - - /** - * Create an instance of {@link Payload.Projects } - * - */ - public Payload.Projects createPayloadProjects() { - return new Payload.Projects(); - } - - /** - * Create an instance of {@link Payload.Cities } - * - */ - public Payload.Cities createPayloadCities() { - return new Payload.Cities(); - } - - /** - * Create an instance of {@link Payload.Users } - * - */ - public Payload.Users createPayloadUsers() { - return new Payload.Users(); - } - - /** - * Create an instance of {@link CityType } - * - */ - public CityType createCityType() { - return new CityType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CityType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://javaops.ru", name = "City") - public JAXBElement createCity(CityType value) { - return new JAXBElement(_City_QNAME, CityType.class, null, value); - } - -} diff --git a/src/main/java/ru/javaops/masterjava/xml/schema/Payload.java b/src/main/java/ru/javaops/masterjava/xml/schema/Payload.java deleted file mode 100644 index 9d4cc30..0000000 --- a/src/main/java/ru/javaops/masterjava/xml/schema/Payload.java +++ /dev/null @@ -1,328 +0,0 @@ - -package ru.javaops.masterjava.xml.schema; - -import javax.xml.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Projects">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence maxOccurs="unbounded">
- *                   <element ref="{http://javaops.ru}Project"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Cities">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence maxOccurs="unbounded">
- *                   <element ref="{http://javaops.ru}City"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Users">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence maxOccurs="unbounded" minOccurs="0">
- *                   <element ref="{http://javaops.ru}User"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *

- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "projects", - "cities", - "users" -}) -@XmlRootElement(name = "Payload", namespace = "http://javaops.ru") -public class Payload { - - @XmlElement(name = "Projects", namespace = "http://javaops.ru", required = true) - protected Payload.Projects projects; - @XmlElement(name = "Cities", namespace = "http://javaops.ru", required = true) - protected Payload.Cities cities; - @XmlElement(name = "Users", namespace = "http://javaops.ru", required = true) - protected Payload.Users users; - - /** - * Gets the value of the projects property. - * - * @return - * possible object is - * {@link Payload.Projects } - * - */ - public Payload.Projects getProjects() { - return projects; - } - - /** - * Sets the value of the projects property. - * - * @param value - * allowed object is - * {@link Payload.Projects } - * - */ - public void setProjects(Payload.Projects value) { - this.projects = value; - } - - /** - * Gets the value of the cities property. - * - * @return - * possible object is - * {@link Payload.Cities } - * - */ - public Payload.Cities getCities() { - return cities; - } - - /** - * Sets the value of the cities property. - * - * @param value - * allowed object is - * {@link Payload.Cities } - * - */ - public void setCities(Payload.Cities value) { - this.cities = value; - } - - /** - * Gets the value of the users property. - * - * @return - * possible object is - * {@link Payload.Users } - * - */ - public Payload.Users getUsers() { - return users; - } - - /** - * Sets the value of the users property. - * - * @param value - * allowed object is - * {@link Payload.Users } - * - */ - public void setUsers(Payload.Users value) { - this.users = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence maxOccurs="unbounded">
-     *         <element ref="{http://javaops.ru}City"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *

- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "city" - }) - public static class Cities { - - @XmlElement(name = "City", namespace = "http://javaops.ru", required = true) - protected List city; - - /** - * Gets the value of the city property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the city property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getCity().add(newItem);
-         *

- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link CityType } - * - * - */ - public List getCity() { - if (city == null) { - city = new ArrayList(); - } - return this.city; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence maxOccurs="unbounded">
-     *         <element ref="{http://javaops.ru}Project"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *

- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "project" - }) - public static class Projects { - - @XmlElement(name = "Project", namespace = "http://javaops.ru", required = true) - protected List project; - - /** - * Gets the value of the project property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getProject().add(newItem);
-         *

- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Project } - * - * - */ - public List getProject() { - if (project == null) { - project = new ArrayList(); - } - return this.project; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence maxOccurs="unbounded" minOccurs="0">
-     *         <element ref="{http://javaops.ru}User"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *

- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "user" - }) - public static class Users { - - @XmlElement(name = "User", namespace = "http://javaops.ru") - protected List user; - - /** - * Gets the value of the user property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getUser().add(newItem);
-         *

- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link User } - * - * - */ - public List getUser() { - if (user == null) { - user = new ArrayList(); - } - return this.user; - } - - } - -} diff --git a/src/main/java/ru/javaops/masterjava/xml/schema/Project.java b/src/main/java/ru/javaops/masterjava/xml/schema/Project.java deleted file mode 100644 index 180a997..0000000 --- a/src/main/java/ru/javaops/masterjava/xml/schema/Project.java +++ /dev/null @@ -1,216 +0,0 @@ - -package ru.javaops.masterjava.xml.schema; - -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <sequence maxOccurs="unbounded">
- *           <element name="Group">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *                   <attribute name="type" use="required" type="{http://javaops.ru}groupType" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *         </sequence>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *

- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "description", - "group" -}) -@XmlRootElement(name = "Project", namespace = "http://javaops.ru") -public class Project { - - @XmlElement(namespace = "http://javaops.ru", required = true) - protected String description; - @XmlElement(name = "Group", namespace = "http://javaops.ru", required = true) - protected List group; - @XmlAttribute(name = "name", required = true) - protected String name; - - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescription(String value) { - this.description = value; - } - - /** - * Gets the value of the group property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getGroup().add(newItem);
-     *

- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Project.Group } - * - * - */ - public List getGroup() { - if (group == null) { - group = new ArrayList(); - } - return this.group; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *       <attribute name="type" use="required" type="{http://javaops.ru}groupType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *

- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Group { - - @XmlAttribute(name = "name", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String name; - @XmlAttribute(name = "type", required = true) - protected GroupType type; - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link GroupType } - * - */ - public GroupType getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link GroupType } - * - */ - public void setType(GroupType value) { - this.type = value; - } - - } - -} diff --git a/src/main/java/ru/javaops/masterjava/xml/schema/User.java b/src/main/java/ru/javaops/masterjava/xml/schema/User.java deleted file mode 100644 index b2cc1c4..0000000 --- a/src/main/java/ru/javaops/masterjava/xml/schema/User.java +++ /dev/null @@ -1,180 +0,0 @@ - -package ru.javaops.masterjava.xml.schema; - -import javax.xml.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="email" type="{http://javaops.ru}emailAddressType" />
- *       <attribute name="flag" use="required" type="{http://javaops.ru}flagType" />
- *       <attribute name="city" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
- *       <attribute name="groupRefs" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
- *

- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "value" -}) -@XmlRootElement(name = "User", namespace = "http://javaops.ru") -public class User { - - @XmlValue - protected String value; - @XmlAttribute(name = "email") - protected String email; - @XmlAttribute(name = "flag", required = true) - protected FlagType flag; - @XmlAttribute(name = "city", required = true) - @XmlIDREF - @XmlSchemaType(name = "IDREF") - protected Object city; - @XmlAttribute(name = "groupRefs") - @XmlIDREF - @XmlSchemaType(name = "IDREFS") - protected List

+ groups +

- groups -

+ groups +

Upload XML

Uploaded users from XML file -

Upload XML

Uploaded users from XML file -

Uploaded users from XML file -

Application Exception:

exception.message