Tom_Shandrikov by NikolaevArtem · Pull Request #51 · NikolaevArtem/Java_Core_June_2021

NikolaevArtem · 2021-07-15T15:54:13Z

No description provided.

NikolaevArtem · 2021-07-15T15:55:10Z

I created a new PR on your behalf to resolve conflicts. You still need to add readme and fix code

src/main/java/homework_1/Main.java

Sotheres · 2021-07-21T07:55:29Z

src/main/java/homework_2/random_chars_table/RandomCharsTable.java

+            e.printStackTrace();
+        }
+        // Корректно ли здесь возвращать null или нет?
+        return null;


In this case upon returning null and assigning it to inputFull in line 23 you risk getting NullPointerExc in line 76 since you haven't checked s for null.

It'll be better to return an empty string. In that way when you will parse it further, in the parseInput() method, you get an exception you handle. Returning null it's not a good manner.

Sotheres · 2021-07-21T08:13:32Z

src/main/java/homework_2/random_chars_table/RandomCharsTable.java

+                int x = (int) (Math.random() * 26 + 65);
+                table[i][j] = (char) x;
+                if (x % 2 == 0) {
+                    strategyEven = strategyEven + " " + table[i][j] + ",";


Because of frequent concatenation it's better to use StringBuilder type for this variables (there would be no new object creation for each concatenation).
Also there is no need to announce this variables as global because you pass reference each time you call methods to operate on them.

Also, using StringBuilder allows you to remove the deleteLastCommaInStrategy() method because StringBuilder has a method deleteCharAt(int ind).

Sotheres · 2021-07-21T08:16:39Z

src/main/java/homework_2/random_chars_table/RandomCharsTable.java

+        }
+
+        if (strategy.equals("odd")) {


May just replace with:

} else { System.out.print(strategyOdd); }

and do not check condition and call extra method.

Try to use "text".equals(string) instead of string.equals("text"). Because the second form can throw NPE in some cases. Not in your case, but it's better to get used right form.
About whole code: I'm not sure about empty lines between strings of code but spaces and code style have been written correctly according to the code convention.

Thank you guys for your remarks. Fixed it!

Sotheres · 2021-07-21T08:24:14Z

src/main/java/homework_2/random_chars_table/RandomCharsTable.java

+        if (str.endsWith(",")) {
+            return str.substring(0, str.length() - 1);
+        } else {
+            return str;


If you use StringBuilder instead there would be just
str.deleteCharAt(str.length() - 1);
and no need to return anything.

Then it's not necessary to add special method for this. Just do it in one line after filling string of letters.

mistaked

# Conflicts: # README.md # src/main/java/homework_1/Main.java

…ure/TomShandrikov # Conflicts: # README.md

src/main/java/homework_1/Main.java

src/main/java/homework_2/pyramid_printer/Main.java

NikolaevArtem · 2021-09-21T17:12:34Z

src/main/java/course_project/sea_battle/Game.java

+
+import java.util.Scanner;
+
+public class Game extends Thread {


The fields look good, except that indentation is shifted

Opt: Also, please introduce automatic ship placement

Good job! Nice interface, well-chosen abstractions, architecture also looks fine. Good skills in Java Core and Java libraries. Special thanks for the description file and png, it helps.

To make better(opt): introduce automatic ship placement and PvE gameplay.

Approved!

I don't see any shifting. Maybe the reason is that I have windows, I don't know. How did you get in? In gameplay or in tests?

Automatic ship placement: Done!

Player vs Computer(easy) mode: Done

NikolaevArtem · 2021-09-21T17:14:05Z

src/main/java/course_project/sea_battle/Game.java

+    public void run() {
+        setUpNames();
+        setUpShips();
+        startGame();


it's more like play();

NikolaevArtem · 2021-09-21T17:16:19Z

src/main/java/course_project/sea_battle/service/ShipPlacer.java

+            }
+        }
+
+//        You can uncomment this block of code instead above for() (lines: 28-42) to place only 2 ships for every player.


That's a code smell, please remove

NikolaevArtem · 2021-09-21T17:18:56Z

src/main/java/course_project/sea_battle/boards/MyShots.java

+public class MyShots extends Board {
+}


I don't understand the purpose of this class

NikolaevArtem · 2021-09-21T17:19:49Z

src/main/java/course_project/sea_battle/service/inputs/InputReader.java

+public abstract class InputReader {
+    protected Scanner scanner;
+
+    public String readLine() {
+        return scanner.nextLine();
+    }
+
+    public Scanner getScanner() {
+        return scanner;
+    }
+}


The purpose of this class in also inclear

This is the only question I have: how could I avoid this abstraction and use tests in this way:
String input = "a1 h\n" +
"a3 h\n" +
...
"\n";
setInput(input);
Because if I have Scanner.in inside class I am testing I have the same exception all the time: no line found. So I solved it this way. Solution for tests...

NikolaevArtem · 2021-09-21T17:21:50Z

src/main/java/homework_3/ImmutableClass.java

+Parameterized constructor must perform Deep Copy.
+ */
+
+public final class ImmutableClass {


The task description is not followed:
несколько конструкторов
метод, который возвращает модифицированный (новый) обьект

NikolaevArtem · 2021-09-21T17:23:10Z

src/main/java/homework_4/customAnnotation/ClassCoffeeAnnotation.java

+@Retention(RetentionPolicy.RUNTIME)
+@Target(TYPE)
+@Inherited
+public @interface ClassCoffeeAnnotation {


Nice, good examples!

NikolaevArtem · 2021-09-21T17:24:46Z

src/main/java/homework_4/customFileReader/CustomFileReader.java

+import java.nio.file.Paths;
+import java.util.Scanner;
+
+public class CustomFileReader {


NikolaevArtem · 2021-09-21T17:25:29Z

src/main/java/homework_4/singleton/Singleton.java

+
+//Basic Singleton
+
+public class Singleton {


NikolaevArtem · 2021-09-21T17:29:53Z

src/main/java/homework_7/kittenToCatFunction/KittenToCatFunction.java

+package homework_7.kittenToCatFunction;
+
+@FunctionalInterface
+public interface KittenToCatFunction<C extends Cat, K extends Kitten>{


Why do you need generics if you don't use them?

NikolaevArtem · 2021-09-21T17:31:31Z

src/main/java/homework_7/kittenToCatFunction/Main.java

+    public static void main(String[] args) {
+
+        Kitten smallCat = new Kitten(1, "Push");
+        KittenToCatFunction function = x -> new Cat(x.getAge() + 2, x.getName(), smallCat);


Good example with Cat having Kitten as a field. I just don't understand why it always have smallCat, but not the provided one...

NikolaevArtem · 2021-09-21T17:32:15Z

src/test/java/homework_4/customFileReader/CustomFileReaderTest.java

+    private String filename = "src/main/resources/custom_file_reader/file.txt";
+
+    @Test
+    void givenTextFile_whenRun1_thenEquals() throws IOException {


Nice names!

NikolaevArtem

Well-done! I'll approve your homework now, but you'll need to fix HW_3. In general - pretty good! I like that for many homework you experimented and did smth extra, not just the min requirement

Approved!

…test.

…r folders.

ashandrikov added 2 commits July 7, 2021 18:52

hometask_1 second commit

e66525b

commit without gradlew.bat

ef9907f

NikolaevArtem commented Jul 15, 2021

View reviewed changes

src/main/java/homework_1/Main.java Outdated Show resolved Hide resolved

NikolaevArtem commented Jul 15, 2021

View reviewed changes

src/main/java/homework_1/Main.java Outdated Show resolved Hide resolved

NikolaevArtem commented Jul 15, 2021

View reviewed changes

src/main/java/homework_1/Main.java Outdated Show resolved Hide resolved

NikolaevArtem added the bug Code fix needed label Jul 15, 2021

First homework has been fixed

6f86142

ashandrikov force-pushed the feature/TomShandrikov branch from 63586b4 to 6f86142 Compare July 20, 2021 11:37

Second homework. ReadMe added.

79b46d5

Sotheres reviewed Jul 21, 2021

View reviewed changes

ashandrikov added 2 commits July 21, 2021 15:40

Immutable class.

3877a6b

Fixed secondHomework.

7ef7cb3

ashandrikov added the readyForReview Sign for Artem to take a look label Jul 21, 2021

Merge branch 'master' into feature/TomShandrikov

e4fd2d1

ashandrikov previously approved these changes Jul 21, 2021

View reviewed changes

ashandrikov added 3 commits July 22, 2021 12:12

Merge branch 'master' into feature/TomShandrikov

af7bd1e

# Conflicts: # README.md # src/main/java/homework_1/Main.java

Full third Homework.

68b209a

Merge remote-tracking branch 'origin/feature/TomShandrikov' into feat…

7f81616

…ure/TomShandrikov # Conflicts: # README.md

NikolaevArtem commented Jul 22, 2021

View reviewed changes

src/main/java/homework_1/Main.java Outdated Show resolved Hide resolved

NikolaevArtem added HW_1 Good to go and removed bug Code fix needed labels Jul 22, 2021

NikolaevArtem commented Jul 22, 2021

View reviewed changes

src/main/java/homework_2/pyramid_printer/Main.java Outdated Show resolved Hide resolved

NikolaevArtem added the HW_2 label Jul 25, 2021

ashandrikov added readyForStudentReview and removed readyForReview Sign for Artem to take a look labels Jul 28, 2021

ashandrikov added 2 commits September 21, 2021 17:21

Finished.

36366f9

Small bug fixed.

9d3d835

NikolaevArtem removed the readyForReview Sign for Artem to take a look label Sep 21, 2021

NikolaevArtem commented Sep 21, 2021

View reviewed changes

NikolaevArtem added the Course Project label Sep 21, 2021

NikolaevArtem commented Sep 21, 2021

View reviewed changes

src/main/java/homework_4/singleton/Singleton.java

//Basic Singleton

public class Singleton {

Copy link

Owner Author

NikolaevArtem Sep 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

NikolaevArtem added HW_4 HW_5 HW_6 labels Sep 21, 2021

NikolaevArtem commented Sep 21, 2021

View reviewed changes

NikolaevArtem added the HW_7 label Sep 21, 2021

NikolaevArtem commented Sep 21, 2021

View reviewed changes

NikolaevArtem added the HW_3 label Sep 21, 2021

ashandrikov added 8 commits September 22, 2021 11:49

Two classes are deleted. Added computer ship placement mode with its …

fc2f103

…test.

Added game mode Player vs Computer(easy).

f546077

hw3 fixed.

e9a861d

hw7 fixed.

d322425

course_project. Small bugs fixed.

33e175b

course_project. Small bugs fixed.

37642d1

course_project. Rearranged some methods and added utils and controlle…

6b82beb

…r folders.

course_project. Hope, last commit. Few changes more.

4e09aa0

Conversation

NikolaevArtem commented Jul 15, 2021

Uh oh!

NikolaevArtem commented Jul 15, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sotheres Jul 21, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sotheres Jul 21, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NikolaevArtem Sep 21, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NikolaevArtem left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Sotheres Jul 21, 2021 •

edited

Loading

Sotheres Jul 21, 2021 •

edited

Loading

NikolaevArtem Sep 21, 2021 •

edited

Loading