Return by const reference where applicable

wravery · wravery · commit d735105aca0c · 2021-12-01T13:14:24.000-08:00
diff --git a/samples/star_wars/DroidData.cpp b/samples/star_wars/DroidData.cpp
@@ -17,11 +17,6 @@ Droid::Droid(response::StringType&& id, std::optional<response::StringType>&& na
 {
 }
 
-const response::StringType& Droid::id() const noexcept
-{
-	return id_;
-}
-
 void Droid::addFriends(
 	std::vector<std::variant<std::shared_ptr<Human>, std::shared_ptr<Droid>>> friends) noexcept
 {
@@ -41,12 +36,12 @@ void Droid::addFriends(
 		});
 }
 
-response::StringType Droid::getId() const noexcept
+const response::StringType& Droid::getId() const noexcept
 {
 	return id_;
 }
 
-std::optional<response::StringType> Droid::getName() const noexcept
+const std::optional<response::StringType>& Droid::getName() const noexcept
 {
 	return name_;
 }
@@ -100,7 +95,7 @@ std::optional<std::vector<std::optional<Episode>>> Droid::getAppearsIn() const n
 	return result.empty() ? std::nullopt : std::make_optional(std::move(result));
 }
 
-std::optional<response::StringType> Droid::getPrimaryFunction() const noexcept
+const std::optional<response::StringType>& Droid::getPrimaryFunction() const noexcept
 {
 	return primaryFunction_;
 }
diff --git a/samples/star_wars/DroidData.h b/samples/star_wars/DroidData.h
@@ -21,14 +21,13 @@ class Droid
 		std::vector<Episode>&& appearsIn,
 		std::optional<response::StringType>&& primaryFunction) noexcept;
 
-	const response::StringType& id() const noexcept;
 	void addFriends(std::vector<SharedHero> friends) noexcept;
 
-	response::StringType getId() const noexcept;
-	std::optional<response::StringType> getName() const noexcept;
+	const response::StringType& getId() const noexcept;
+	const std::optional<response::StringType>& getName() const noexcept;
 	std::optional<std::vector<std::shared_ptr<service::Object>>> getFriends() const noexcept;
 	std::optional<std::vector<std::optional<Episode>>> getAppearsIn() const noexcept;
-	std::optional<response::StringType> getPrimaryFunction() const noexcept;
+	const std::optional<response::StringType>& getPrimaryFunction() const noexcept;
 
 private:
 	const response::StringType id_;
diff --git a/samples/star_wars/HumanData.cpp b/samples/star_wars/HumanData.cpp
@@ -16,11 +16,6 @@ Human::Human(response::StringType&& id, std::optional<response::StringType>&& na
 {
 }
 
-const response::StringType& Human::id() const noexcept
-{
-	return id_;
-}
-
 void Human::addFriends(std::vector<SharedHero> friends) noexcept
 {
 	friends_.resize(friends.size());
@@ -39,12 +34,12 @@ void Human::addFriends(std::vector<SharedHero> friends) noexcept
 		});
 }
 
-response::StringType Human::getId() const noexcept
+const response::StringType& Human::getId() const noexcept
 {
 	return id_;
 }
 
-std::optional<response::StringType> Human::getName() const noexcept
+const std::optional<response::StringType>& Human::getName() const noexcept
 {
 	return name_;
 }
@@ -98,7 +93,7 @@ std::optional<std::vector<std::optional<Episode>>> Human::getAppearsIn() const n
 	return result.empty() ? std::nullopt : std::make_optional(std::move(result));
 }
 
-std::optional<response::StringType> Human::getHomePlanet() const noexcept
+const std::optional<response::StringType>& Human::getHomePlanet() const noexcept
 {
 	return homePlanet_;
 }
diff --git a/samples/star_wars/HumanData.h b/samples/star_wars/HumanData.h
@@ -19,14 +19,13 @@ class Human
 		std::vector<Episode>&& appearsIn,
 		std::optional<response::StringType>&& homePlanet) noexcept;
 
-	const response::StringType& id() const noexcept;
 	void addFriends(std::vector<SharedHero> friends) noexcept;
 
-	response::StringType getId() const noexcept;
-	std::optional<response::StringType> getName() const noexcept;
+	const response::StringType& getId() const noexcept;
+	const std::optional<response::StringType>& getName() const noexcept;
 	std::optional<std::vector<std::shared_ptr<service::Object>>> getFriends() const noexcept;
 	std::optional<std::vector<std::optional<Episode>>> getAppearsIn() const noexcept;
-	std::optional<response::StringType> getHomePlanet() const noexcept;
+	const std::optional<response::StringType>& getHomePlanet() const noexcept;
 
 private:
 	const response::StringType id_;
diff --git a/samples/star_wars/ReviewData.cpp b/samples/star_wars/ReviewData.cpp
@@ -16,7 +16,7 @@ response::IntType Review::getStars() const noexcept
 	return stars_;
 }
 
-std::optional<response::StringType> Review::getCommentary() const noexcept
+const std::optional<response::StringType>& Review::getCommentary() const noexcept
 {
 	return commentary_;
 }
diff --git a/samples/star_wars/ReviewData.h b/samples/star_wars/ReviewData.h
@@ -17,7 +17,7 @@ class Review
 		response::IntType stars, std::optional<response::StringType>&& commentary) noexcept;
 
 	response::IntType getStars() const noexcept;
-	std::optional<response::StringType> getCommentary() const noexcept;
+	const std::optional<response::StringType>& getCommentary() const noexcept;
 
 private:
 	const response::IntType stars_;
diff --git a/samples/star_wars/StarWarsData.cpp b/samples/star_wars/StarWarsData.cpp
@@ -100,16 +100,16 @@ std::shared_ptr<service::Request> GetService() noexcept
 	};
 
 	std::map<response::StringType, std::shared_ptr<learn::Human>> humans {
-		{ luke->id(), luke },
-		{ vader->id(), vader },
-		{ han->id(), han },
-		{ leia->id(), leia },
-		{ tarkin->id(), tarkin },
+		{ luke->getId(), luke },
+		{ vader->getId(), vader },
+		{ han->getId(), han },
+		{ leia->getId(), leia },
+		{ tarkin->getId(), tarkin },
 	};
 
 	std::map<response::StringType, std::shared_ptr<learn::Droid>> droids {
-		{ threepio->id(), threepio },
-		{ artoo->id(), artoo },
+		{ threepio->getId(), threepio },
+		{ artoo->getId(), artoo },
 	};
 
 	auto query =
diff --git a/samples/today/TodayMock.h b/samples/today/TodayMock.h
@@ -417,7 +417,7 @@ class CompleteTaskPayload
 		return std::make_shared<object::Task>(_task);
 	}
 
-	std::optional<response::StringType> getClientMutationId() const noexcept
+	const std::optional<response::StringType>& getClientMutationId() const noexcept
 	{
 		return _clientMutationId;
 	}

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,6 @@ Droid::Droid(response::StringType&& id, std::optional<response::StringType>&& na`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`		`-const response::StringType& Droid::id() const noexcept`
`21`		`-{`
`22`		`- return id_;`
`23`		`-}`
`24`		`-`
`25`	`20`	`void Droid::addFriends(`
`26`	`21`	`std::vector<std::variant<std::shared_ptr<Human>, std::shared_ptr<Droid>>> friends) noexcept`
`27`	`22`	`{`
`@@ -41,12 +36,12 @@ void Droid::addFriends(`
`41`	`36`	`});`
`42`	`37`	`}`
`43`	`38`
`44`		`-response::StringType Droid::getId() const noexcept`
	`39`	`+const response::StringType& Droid::getId() const noexcept`
`45`	`40`	`{`
`46`	`41`	`return id_;`
`47`	`42`	`}`
`48`	`43`
`49`		`-std::optional<response::StringType> Droid::getName() const noexcept`
	`44`	`+const std::optional<response::StringType>& Droid::getName() const noexcept`
`50`	`45`	`{`
`51`	`46`	`return name_;`
`52`	`47`	`}`
`@@ -100,7 +95,7 @@ std::optional<std::vector<std::optional<Episode>>> Droid::getAppearsIn() const n`
`100`	`95`	`return result.empty() ? std::nullopt : std::make_optional(std::move(result));`
`101`	`96`	`}`
`102`	`97`
`103`		`-std::optional<response::StringType> Droid::getPrimaryFunction() const noexcept`
	`98`	`+const std::optional<response::StringType>& Droid::getPrimaryFunction() const noexcept`
`104`	`99`	`{`
`105`	`100`	`return primaryFunction_;`
`106`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,6 @@ Human::Human(response::StringType&& id, std::optional<response::StringType>&& na`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`		`-const response::StringType& Human::id() const noexcept`
`20`		`-{`
`21`		`- return id_;`
`22`		`-}`
`23`		`-`
`24`	`19`	`void Human::addFriends(std::vector<SharedHero> friends) noexcept`
`25`	`20`	`{`
`26`	`21`	`friends_.resize(friends.size());`
`@@ -39,12 +34,12 @@ void Human::addFriends(std::vector<SharedHero> friends) noexcept`
`39`	`34`	`});`
`40`	`35`	`}`
`41`	`36`
`42`		`-response::StringType Human::getId() const noexcept`
	`37`	`+const response::StringType& Human::getId() const noexcept`
`43`	`38`	`{`
`44`	`39`	`return id_;`
`45`	`40`	`}`
`46`	`41`
`47`		`-std::optional<response::StringType> Human::getName() const noexcept`
	`42`	`+const std::optional<response::StringType>& Human::getName() const noexcept`
`48`	`43`	`{`
`49`	`44`	`return name_;`
`50`	`45`	`}`
`@@ -98,7 +93,7 @@ std::optional<std::vector<std::optional<Episode>>> Human::getAppearsIn() const n`
`98`	`93`	`return result.empty() ? std::nullopt : std::make_optional(std::move(result));`
`99`	`94`	`}`
`100`	`95`
`101`		`-std::optional<response::StringType> Human::getHomePlanet() const noexcept`
	`96`	`+const std::optional<response::StringType>& Human::getHomePlanet() const noexcept`
`102`	`97`	`{`
`103`	`98`	`return homePlanet_;`
`104`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ response::IntType Review::getStars() const noexcept`
`16`	`16`	`return stars_;`
`17`	`17`	`}`
`18`	`18`
`19`		`-std::optional<response::StringType> Review::getCommentary() const noexcept`
	`19`	`+const std::optional<response::StringType>& Review::getCommentary() const noexcept`
`20`	`20`	`{`
`21`	`21`	`return commentary_;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ class CompleteTaskPayload`
`417`	`417`	`return std::make_shared<object::Task>(_task);`
`418`	`418`	`}`
`419`	`419`
`420`		`- std::optional<response::StringType> getClientMutationId() const noexcept`
	`420`	`+ const std::optional<response::StringType>& getClientMutationId() const noexcept`
`421`	`421`	`{`
`422`	`422`	`return _clientMutationId;`
`423`	`423`	`}`