Adding support for the package attribute on the types element. #904
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright 2013-2022 Real Logic Limited. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package uk.co.real_logic.sbe.generation; | ||
|
|
||
| import org.agrona.generation.OutputManager; | ||
|
|
||
| /** | ||
| * Extended version of the OutputManager allowing to set the java package. To be moved to agrona. | ||
| */ | ||
| public interface MultiPackageOutputManager extends OutputManager | ||
| { | ||
| /** | ||
| * Sets the current package name. | ||
| * @param packageName the packageName | ||
| */ | ||
| void setPackageName(String packageName); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright 2013-2022 Real Logic Limited. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package uk.co.real_logic.sbe.generation.java; | ||
|
|
||
| import java.io.FilterWriter; | ||
| import java.io.IOException; | ||
| import java.io.Writer; | ||
| import org.agrona.collections.Object2NullableObjectHashMap; | ||
| import org.agrona.collections.Object2ObjectHashMap; | ||
| import org.agrona.generation.PackageOutputManager; | ||
| import uk.co.real_logic.sbe.generation.MultiPackageOutputManager; | ||
|
|
||
| /** | ||
| * Implementation of {@link MultiPackageOutputManager} for Java. | ||
| */ | ||
| public class JavaOutputManager implements MultiPackageOutputManager | ||
| { | ||
|
|
||
ratcashdev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private final String baseDirName; | ||
| private final PackageOutputManager global; | ||
|
There was a problem hiding this comment. Naming should be more explicit. There was a problem hiding this comment. Naming's difficult. But tried to do my best. |
||
| private PackageOutputManager acting; | ||
| private final Object2ObjectHashMap<String, PackageOutputManager> outputManagerCache | ||
| = new Object2NullableObjectHashMap<>(); | ||
|
|
||
| /** | ||
| * Constructor. | ||
| * @param baseDirName the target directory | ||
| * @param packageName the initial package name | ||
| */ | ||
| public JavaOutputManager(final String baseDirName, final String packageName) | ||
| { | ||
| global = new PackageOutputManager(baseDirName, packageName); | ||
| acting = global; | ||
| this.baseDirName = baseDirName; | ||
| } | ||
|
|
||
| @Override | ||
| public void setPackageName(final String packageName) | ||
| { | ||
| acting = outputManagerCache.get(packageName); | ||
| if (acting == null) | ||
| { | ||
| acting = new PackageOutputManager(baseDirName, packageName); | ||
| outputManagerCache.put(packageName, acting); | ||
| } | ||
| } | ||
|
|
||
| private void resetPackage() | ||
| { | ||
| acting = global; | ||
| } | ||
|
|
||
| @Override | ||
|
There was a problem hiding this comment. @OverRide not used in code style. |
||
| public Writer createOutput(final String name) throws IOException | ||
| { | ||
| return new FilterWriter(acting.createOutput(name)) | ||
| { | ||
| @Override | ||
ratcashdev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| public void close() throws IOException | ||
| { | ||
| super.close(); | ||
| resetPackage(); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this default to
true?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unless
TYPE_PACKAGE_OVERRIDEis explicitly set totrue, the generator will not respect package overrides, therefore behave like before this change - unless I am missing something here?