From 12cfb03e3eef9fc252801ff9878d0c6ccf832c99 Mon Sep 17 00:00:00 2001 From: gooseFn Date: Mon, 20 Oct 2025 19:11:53 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?= =?UTF-8?q?=D0=BD=D0=BB=201-3=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- task01/README.md | 6 +- task01/src/com/example/task01/ErrorLevel.java | 8 ++ task01/src/com/example/task01/Logger.java | 89 +++++++++++++++++++ task01/src/com/example/task01/Task01Main.java | 6 +- .../src/com/example/task02/DiscountBill.java | 21 +++++ task02/src/com/example/task02/Task02Main.java | 13 ++- task03/src/com/example/task03/Hours.java | 27 ++++++ .../src/com/example/task03/Milliseconds.java | 17 ++-- task03/src/com/example/task03/Minutes.java | 21 +++-- task03/src/com/example/task03/Seconds.java | 17 ++-- task03/src/com/example/task03/TimeUnit.java | 2 +- .../src/com/example/task03/TimeUnitUtils.java | 40 +++++++++ 12 files changed, 240 insertions(+), 27 deletions(-) create mode 100644 task01/src/com/example/task01/ErrorLevel.java create mode 100644 task01/src/com/example/task01/Logger.java create mode 100644 task02/src/com/example/task02/DiscountBill.java create mode 100644 task03/src/com/example/task03/Hours.java diff --git a/task01/README.md b/task01/README.md index 5e41b92c..456bddd8 100644 --- a/task01/README.md +++ b/task01/README.md @@ -5,7 +5,11 @@ Требования к классу `Logger`: * Каждому экземпляру класса можно задать имя. Имя можно получить, вызвав публичный метод `String getName()`. -* В классе должен быть публичный статический метод `getLogger(String name)`, возвращающий экземпляр логгера с указанным именем. Повторый вызов с тем же аргументом должен возвращать тот же самый экземпляр, что и при первом вызове. Если продемонстрировать это кодом, то следующий код должен возвращать true: +* В классе должен быть публичный статический метод `getLogger(String name)`, +* возвращающий экземпляр логгера с указанным именем. +* Повторый вызов с тем же аргументом должен возвращать тот же самый экземпляр, +* что и при первом вызове. Если продемонстрировать это кодом, +* то следующий код должен возвращать true: ``` Logger logger1 = Logger.getLogger("test") Logger logger2 = Logger.getLogger("test") diff --git a/task01/src/com/example/task01/ErrorLevel.java b/task01/src/com/example/task01/ErrorLevel.java new file mode 100644 index 00000000..684ffedf --- /dev/null +++ b/task01/src/com/example/task01/ErrorLevel.java @@ -0,0 +1,8 @@ +package com.example.task01; + +public enum ErrorLevel { + DEBUG, + INFO, + WARNING, + ERROR +} diff --git a/task01/src/com/example/task01/Logger.java b/task01/src/com/example/task01/Logger.java new file mode 100644 index 00000000..841503ad --- /dev/null +++ b/task01/src/com/example/task01/Logger.java @@ -0,0 +1,89 @@ +package com.example.task01; + +import java.text.MessageFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; + +public class Logger { + private final String name; + private ErrorLevel level; + private static final ArrayList loggers = new ArrayList<>(); + + public Logger(String name) { + this.name = name; + this.level = ErrorLevel.INFO; + loggers.add(this); + } + + public Logger(String name, ErrorLevel level) { + this.name = name; + this.level = level; + loggers.add(this); + } + + public String getName() { + return name; + } + + public ErrorLevel getLevel() { + return level; + } + + public void setLevel(ErrorLevel level) { + this.level = level; + } + + public static Logger getLogger(String name) { + for (Logger logger : loggers) { + if (logger.getName().equals(name)) return logger; + } + return new Logger(name); + } + + public void log(ErrorLevel level, String message) { + if (this.level.ordinal() <= level.ordinal()) { + String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")); + String formattedMessage = MessageFormat.format("[{0}] {1} {2} - {3}", level, dateTime, name, message); + System.out.println(formattedMessage); + } + } + + public void log(ErrorLevel level, String pattern, Object... args) { + if (this.level.ordinal() <= level.ordinal()) { + System.out.println(MessageFormat.format(pattern, args)); + } + } + + public void debug(String message) { + log(ErrorLevel.DEBUG, message); + } + + public void debug(String pattern, Object... args) { + log(ErrorLevel.DEBUG, pattern, args); + } + + public void info(String message) { + log(ErrorLevel.INFO, message); + } + + public void info(String pattern, Object... args) { + log(ErrorLevel.INFO, pattern, args); + } + + public void warning(String message) { + log(ErrorLevel.WARNING, message); + } + + public void warning(String pattern, Object... args) { + log(ErrorLevel.WARNING, pattern, args); + } + + public void error(String message) { + log(ErrorLevel.ERROR, message); + } + + public void error(String pattern, Object... args) { + log(ErrorLevel.ERROR, pattern, args); + } +} \ No newline at end of file diff --git a/task01/src/com/example/task01/Task01Main.java b/task01/src/com/example/task01/Task01Main.java index 9973557d..debe111a 100644 --- a/task01/src/com/example/task01/Task01Main.java +++ b/task01/src/com/example/task01/Task01Main.java @@ -2,6 +2,10 @@ public class Task01Main { public static void main(String[] args) { - + Logger logger1 = new Logger("name"); + Logger logger2 = Logger.getLogger("name1"); + Logger logger3 = Logger.getLogger("name1"); + System.out.println(logger1 == logger2); + System.out.println(logger2 == logger3); } } diff --git a/task02/src/com/example/task02/DiscountBill.java b/task02/src/com/example/task02/DiscountBill.java new file mode 100644 index 00000000..62ca3885 --- /dev/null +++ b/task02/src/com/example/task02/DiscountBill.java @@ -0,0 +1,21 @@ +package com.example.task02; + +public class DiscountBill extends Bill{ + private final double discount; + public DiscountBill(double discount) { + this.discount = discount; + } + + public String getDiscount(){ + return discount + "%"; + } + + public long getAbsoluteDiscount() { + return super.getPrice() - getPrice(); + } + @Override + public long getPrice() { + long price = super.getPrice(); + return (long) (price * (1 - discount / 100)); + } +} diff --git a/task02/src/com/example/task02/Task02Main.java b/task02/src/com/example/task02/Task02Main.java index e589f2d3..a367a61f 100644 --- a/task02/src/com/example/task02/Task02Main.java +++ b/task02/src/com/example/task02/Task02Main.java @@ -10,12 +10,19 @@ public class Task02Main { private static final Item ITEM6 = new Item("Товар 6", 60); public static void main(String[] args) { + System.out.println("Обычный счет"); Bill bill = new Bill(); bill.add(ITEM1, 10); bill.add(ITEM3, 3); bill.add(ITEM6, 1); System.out.println(bill); - bill.add(ITEM3, 3); - System.out.println(bill); + System.out.println("Cчет со скидкой"); + DiscountBill discountBill = new DiscountBill(10.5); + discountBill.add(ITEM1, 10); + discountBill.add(ITEM3, 3); + discountBill.add(ITEM6, 1); + System.out.println(discountBill); + System.out.println(discountBill.getDiscount()); + System.out.println(discountBill.getAbsoluteDiscount()); } -} +} \ No newline at end of file diff --git a/task03/src/com/example/task03/Hours.java b/task03/src/com/example/task03/Hours.java new file mode 100644 index 00000000..a2864d6e --- /dev/null +++ b/task03/src/com/example/task03/Hours.java @@ -0,0 +1,27 @@ +package com.example.task03; + +public class Hours implements TimeUnit{ + private final long hours; + public Hours(long hours) { + this.hours = hours; + } + + @Override + public long toMillis() { + return hours * 3600 * 1000; + } + + @Override + public long toSeconds() { + return hours * 3600; + } + + @Override + public long toMinutes() { + return hours * 60; + } + @Override + public long getHours() { + return hours; + } +} diff --git a/task03/src/com/example/task03/Milliseconds.java b/task03/src/com/example/task03/Milliseconds.java index 5115bc7d..25e90744 100644 --- a/task03/src/com/example/task03/Milliseconds.java +++ b/task03/src/com/example/task03/Milliseconds.java @@ -5,24 +5,29 @@ */ public class Milliseconds implements TimeUnit { - private final long amount; + private final long milliseconds; - public Milliseconds(long amount) { - this.amount = amount; + public Milliseconds(long milliseconds) { + this.milliseconds = milliseconds; } @Override public long toMillis() { - return amount; + return milliseconds; } @Override public long toSeconds() { - return amount / 1000; + return Math.round(milliseconds / 1000f); } @Override public long toMinutes() { - return amount / 1000 * 60; + return Math.round(milliseconds / (float) (1000 * 60)); + } + + @Override + public long getHours() { + return Math.round(milliseconds / (float) (3600 * 1000)); } } diff --git a/task03/src/com/example/task03/Minutes.java b/task03/src/com/example/task03/Minutes.java index d6fa0594..8a9a4f4d 100644 --- a/task03/src/com/example/task03/Minutes.java +++ b/task03/src/com/example/task03/Minutes.java @@ -2,26 +2,29 @@ public class Minutes implements TimeUnit { - public Minutes(long amount) { - // TODO: реализовать - throw new UnsupportedOperationException(); + private final long minutes; + + public Minutes(long minutes) { + this.minutes = minutes; } @Override public long toMillis() { - // TODO: реализовать - throw new UnsupportedOperationException(); + return minutes * 60 * 1000; } @Override public long toSeconds() { - // TODO: реализовать - throw new UnsupportedOperationException(); + return minutes * 60; } @Override public long toMinutes() { - // TODO: реализовать - throw new UnsupportedOperationException(); + return minutes; + } + + @Override + public long getHours() { + return Math.round(minutes / 60f); } } diff --git a/task03/src/com/example/task03/Seconds.java b/task03/src/com/example/task03/Seconds.java index ce6bc213..a3713998 100644 --- a/task03/src/com/example/task03/Seconds.java +++ b/task03/src/com/example/task03/Seconds.java @@ -5,24 +5,29 @@ */ public class Seconds implements TimeUnit { - private final long amount; + private final long seconds; - public Seconds(long amount) { - this.amount = amount; + public Seconds(long seconds) { + this.seconds = seconds; } @Override public long toMillis() { - return amount * 1000; + return seconds * 1000; } @Override public long toSeconds() { - return amount; + return seconds; } @Override public long toMinutes() { - return Math.round(amount / 60); + return Math.round(seconds / 60f); + } + + @Override + public long getHours() { + return Math.round(seconds / 3600f); } } diff --git a/task03/src/com/example/task03/TimeUnit.java b/task03/src/com/example/task03/TimeUnit.java index 3b123fb8..c22d1175 100644 --- a/task03/src/com/example/task03/TimeUnit.java +++ b/task03/src/com/example/task03/TimeUnit.java @@ -27,5 +27,5 @@ public interface TimeUnit { * @return количество минут в текущем интервале */ long toMinutes(); - + long getHours(); } diff --git a/task03/src/com/example/task03/TimeUnitUtils.java b/task03/src/com/example/task03/TimeUnitUtils.java index 790f8850..c36088f4 100644 --- a/task03/src/com/example/task03/TimeUnitUtils.java +++ b/task03/src/com/example/task03/TimeUnitUtils.java @@ -15,6 +15,14 @@ public static Milliseconds toMillis(Seconds seconds) { return new Milliseconds(seconds.toMillis()); } + public static Milliseconds toMillis(Minutes minutes) { + return new Milliseconds(minutes.toMillis()); + } + + public static Milliseconds toMillis(Hours hours) { + return new Milliseconds(hours.toMillis()); + } + /** * Конвертирует интервал в миллисекундах в интервал в секундах * @@ -24,4 +32,36 @@ public static Milliseconds toMillis(Seconds seconds) { public static Seconds toSeconds(Milliseconds millis) { return new Seconds(millis.toSeconds()); } + + public static Seconds toSeconds(Minutes minutes) { + return new Seconds(minutes.toSeconds()); + } + + public static Seconds toSeconds(Hours hours) { + return new Seconds(hours.toSeconds()); + } + + public static Minutes toMinutes(Milliseconds milliseconds) { + return new Minutes(milliseconds.toMinutes()); + } + + public static Minutes toMinutes(Seconds seconds) { + return new Minutes(seconds.toMinutes()); + } + + public static Minutes toMinutes(Hours hours) { + return new Minutes(hours.toMinutes()); + } + + public static Hours toHours(Milliseconds milliseconds) { + return new Hours(milliseconds.getHours()); + } + + public static Hours toHours(Seconds seconds) { + return new Hours(seconds.getHours()); + } + + public static Hours toHours(Minutes minutes) { + return new Hours(minutes.getHours()); + } } From e7db60ffaf104f4f5f7d9f75d098e9228ce8c03f Mon Sep 17 00:00:00 2001 From: gooseFn Date: Tue, 21 Oct 2025 00:14:18 +0500 Subject: [PATCH 2/2] Done --- task01/src/com/example/task01/Logger.java | 2 +- .../com/example/task04/ConsoleHandler.java | 8 ++ task04/src/com/example/task04/ErrorLevel.java | 8 ++ .../src/com/example/task04/FileHandler.java | 18 ++++ task04/src/com/example/task04/Logger.java | 102 ++++++++++++++++++ .../src/com/example/task04/MemoryHandler.java | 29 +++++ .../com/example/task04/MessageHandler.java | 5 + .../example/task04/RotationFileHandler.java | 27 +++++ 8 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 task04/src/com/example/task04/ConsoleHandler.java create mode 100644 task04/src/com/example/task04/ErrorLevel.java create mode 100644 task04/src/com/example/task04/FileHandler.java create mode 100644 task04/src/com/example/task04/Logger.java create mode 100644 task04/src/com/example/task04/MemoryHandler.java create mode 100644 task04/src/com/example/task04/MessageHandler.java create mode 100644 task04/src/com/example/task04/RotationFileHandler.java diff --git a/task01/src/com/example/task01/Logger.java b/task01/src/com/example/task01/Logger.java index 841503ad..81dcf43c 100644 --- a/task01/src/com/example/task01/Logger.java +++ b/task01/src/com/example/task01/Logger.java @@ -43,7 +43,7 @@ public static Logger getLogger(String name) { public void log(ErrorLevel level, String message) { if (this.level.ordinal() <= level.ordinal()) { - String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")); + String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy.MM.dd hh:mm:ss")); String formattedMessage = MessageFormat.format("[{0}] {1} {2} - {3}", level, dateTime, name, message); System.out.println(formattedMessage); } diff --git a/task04/src/com/example/task04/ConsoleHandler.java b/task04/src/com/example/task04/ConsoleHandler.java new file mode 100644 index 00000000..b0b030ff --- /dev/null +++ b/task04/src/com/example/task04/ConsoleHandler.java @@ -0,0 +1,8 @@ +package com.example.task04; + +public class ConsoleHandler implements MessageHandler { + @Override + public void log(String message) { + System.out.println(message); + } +} diff --git a/task04/src/com/example/task04/ErrorLevel.java b/task04/src/com/example/task04/ErrorLevel.java new file mode 100644 index 00000000..c3153de7 --- /dev/null +++ b/task04/src/com/example/task04/ErrorLevel.java @@ -0,0 +1,8 @@ +package com.example.task04; + +public enum ErrorLevel { + DEBUG, + INFO, + WARNING, + ERROR +} diff --git a/task04/src/com/example/task04/FileHandler.java b/task04/src/com/example/task04/FileHandler.java new file mode 100644 index 00000000..f78c79dd --- /dev/null +++ b/task04/src/com/example/task04/FileHandler.java @@ -0,0 +1,18 @@ +package com.example.task04; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; + +public class FileHandler implements MessageHandler { + private final PrintWriter writer; + + public FileHandler(String filePath) throws IOException { + this.writer = new PrintWriter(new FileWriter(filePath, true)); + } + + @Override + public void log(String message) { + writer.println(message); + } +} diff --git a/task04/src/com/example/task04/Logger.java b/task04/src/com/example/task04/Logger.java new file mode 100644 index 00000000..081cd817 --- /dev/null +++ b/task04/src/com/example/task04/Logger.java @@ -0,0 +1,102 @@ +package com.example.task04; + +import java.text.MessageFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; + +public class Logger { + private final String name; + private ErrorLevel level; + private static final ArrayList loggers = new ArrayList<>(); + private static ArrayList handlers = new ArrayList<>(); + + public Logger(String name) { + this.name = name; + this.level = ErrorLevel.INFO; + loggers.add(this); + handlers.add(new ConsoleHandler()); + } + + public Logger(String name, ArrayList messageHandlers) { + this.name = name; + this.level = ErrorLevel.INFO; + handlers = messageHandlers; + loggers.add(this); + } + + public Logger(String name, ErrorLevel level, ArrayList messageHandlers) { + this.name = name; + this.level = level; + handlers = messageHandlers; + loggers.add(this); + } + + public String getName() { + return name; + } + + public ErrorLevel getLevel() { + return level; + } + + public void setLevel(ErrorLevel level) { + this.level = level; + } + + public static Logger getLogger(String name) { + for (Logger logger : loggers) { + if (logger.getName().equals(name)) return logger; + } + return new Logger(name); + } + + public void log(ErrorLevel level, String message) { + if (this.level.ordinal() <= level.ordinal()) { + String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy.MM.dd hh:mm:ss")); + String formattedMessage = MessageFormat.format("[{0}] {1} {2} - {3}", level, dateTime, name, message); + for (MessageHandler messageHandler : handlers) + messageHandler.log(formattedMessage); + } + } + + public void log(ErrorLevel level, String pattern, Object... args) { + if (this.level.ordinal() <= level.ordinal()) { + String message = MessageFormat.format(pattern, args); + for (MessageHandler messageHandler : handlers) + messageHandler.log(message); + } + } + + public void debug(String message) { + log(ErrorLevel.DEBUG, message); + } + + public void debug(String pattern, Object... args) { + log(ErrorLevel.DEBUG, pattern, args); + } + + public void info(String message) { + log(ErrorLevel.INFO, message); + } + + public void info(String pattern, Object... args) { + log(ErrorLevel.INFO, pattern, args); + } + + public void warning(String message) { + log(ErrorLevel.WARNING, message); + } + + public void warning(String pattern, Object... args) { + log(ErrorLevel.WARNING, pattern, args); + } + + public void error(String message) { + log(ErrorLevel.ERROR, message); + } + + public void error(String pattern, Object... args) { + log(ErrorLevel.ERROR, pattern, args); + } +} \ No newline at end of file diff --git a/task04/src/com/example/task04/MemoryHandler.java b/task04/src/com/example/task04/MemoryHandler.java new file mode 100644 index 00000000..c3fae719 --- /dev/null +++ b/task04/src/com/example/task04/MemoryHandler.java @@ -0,0 +1,29 @@ +package com.example.task04; + +import java.util.ArrayList; + +public class MemoryHandler implements MessageHandler { + private final int maxSize; + private final ArrayList messages = new ArrayList<>(); + private final MessageHandler proxyHandler; + public MemoryHandler(MessageHandler proxyHandler, int maxSize) { + this.proxyHandler = proxyHandler; + this.maxSize = maxSize; + } + + public void flush() { + for (String message : messages) { + proxyHandler.log(message); + } + messages.clear(); + } + + @Override + public void log(String message) { + messages.add(message); + if (messages.size() >= maxSize) { + flush(); + } + } + +} diff --git a/task04/src/com/example/task04/MessageHandler.java b/task04/src/com/example/task04/MessageHandler.java new file mode 100644 index 00000000..13beca02 --- /dev/null +++ b/task04/src/com/example/task04/MessageHandler.java @@ -0,0 +1,5 @@ +package com.example.task04; + +public interface MessageHandler { + void log(String message); +} diff --git a/task04/src/com/example/task04/RotationFileHandler.java b/task04/src/com/example/task04/RotationFileHandler.java new file mode 100644 index 00000000..125f1ba2 --- /dev/null +++ b/task04/src/com/example/task04/RotationFileHandler.java @@ -0,0 +1,27 @@ +package com.example.task04; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; + +public class RotationFileHandler implements MessageHandler { + private final String path; + private final ChronoUnit rotation; + public RotationFileHandler(String path, ChronoUnit rotation) { + this.path = path; + this.rotation = rotation; + } + + @Override + public void log(String message) { + LocalDateTime date = LocalDateTime.now().truncatedTo(rotation); + File file = new File(path + date.toString().replace(':','#') + ".txt"); + try (FileOutputStream fileOutputStream = new FileOutputStream(file)) { + fileOutputStream.write(message.getBytes()); + } catch (IOException ex) { + System.out.println(ex.getMessage()); + } + } +}